summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--libavcodec/dsputil.c137
-rw-r--r--libavcodec/dsputil.h2
-rw-r--r--libavcodec/motion_est.c15
-rw-r--r--libavcodec/mpegvideo.c2
-rw-r--r--libavcodec/mpegvideo.h1
5 files changed, 153 insertions, 4 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index fb63997..44b4899 100644
--- a/libavcodec/dsputil.c
+++ b/libavcodec/dsputil.c
@@ -1835,7 +1835,7 @@ static int quant_psnr8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *s
memcpy(bak, temp, 64*sizeof(DCTELEM));
- s->dct_quantize(s, temp, 0/*FIXME*/, s->qscale, &i);
+ s->fast_dct_quantize(s, temp, 0/*FIXME*/, s->qscale, &i);
s->dct_unquantize(s, temp, 0, s->qscale);
simple_idct(temp); //FIXME
@@ -1845,9 +1845,136 @@ static int quant_psnr8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *s
return sum;
}
+static int rd8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride){
+ MpegEncContext * const s= (MpegEncContext *)c;
+ const UINT8 *scantable= s->intra_scantable.permutated;
+ DCTELEM temp[64];
+ uint8_t bak[stride*8];
+ int i, last, run, bits, level, distoration, start_i;
+ const int esc_length= s->ac_esc_length;
+ uint8_t * length;
+ uint8_t * last_length;
+
+ s->mb_intra=0;
+
+ if (s->mb_intra) {
+ start_i = 1;
+ length = s->intra_ac_vlc_length;
+ last_length= s->intra_ac_vlc_last_length;
+ } else {
+ start_i = 0;
+ length = s->inter_ac_vlc_length;
+ last_length= s->inter_ac_vlc_last_length;
+ }
+
+ for(i=0; i<8; i++){
+ ((uint32_t*)(bak + i*stride))[0]= ((uint32_t*)(src2 + i*stride))[0];
+ ((uint32_t*)(bak + i*stride))[1]= ((uint32_t*)(src2 + i*stride))[1];
+ }
+
+ s->dsp.diff_pixels(temp, src1, src2, stride);
+
+ last= s->fast_dct_quantize(s, temp, 0/*FIXME*/, s->qscale, &i);
+
+ bits=0;
+ if(last>=0){
+ run=0;
+ for(i=start_i; i<last; i++){
+ int j= scantable[i];
+ level= temp[j];
+
+ if(level){
+ level+=64;
+ if((level&(~127)) == 0){
+ bits+= length[UNI_AC_ENC_INDEX(run, level)];
+ }else
+ bits+= esc_length;
+ run=0;
+ }else
+ run++;
+ }
+ i= scantable[last];
+
+ assert(level);
+
+ level= temp[i] + 64;
+ if((level&(~127)) == 0){
+ bits+= last_length[UNI_AC_ENC_INDEX(run, level)];
+ }else
+ bits+= esc_length;
+
+ s->dct_unquantize(s, temp, 0, s->qscale);
+ }
+
+ s->idct_add(bak, stride, temp);
+
+ distoration= s->dsp.sse[1](NULL, bak, src1, stride);
+
+ return distoration + ((bits*s->qscale*s->qscale*105 + 64)>>7);
+}
+
+static int bit8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride){
+ MpegEncContext * const s= (MpegEncContext *)c;
+ const UINT8 *scantable= s->intra_scantable.permutated;
+ DCTELEM temp[64];
+ int i, last, run, bits, level, start_i;
+ const int esc_length= s->ac_esc_length;
+ uint8_t * length;
+ uint8_t * last_length;
+
+ s->mb_intra=0;
+
+ if (s->mb_intra) {
+ start_i = 1;
+ length = s->intra_ac_vlc_length;
+ last_length= s->intra_ac_vlc_last_length;
+ } else {
+ start_i = 0;
+ length = s->inter_ac_vlc_length;
+ last_length= s->inter_ac_vlc_last_length;
+ }
+
+ s->dsp.diff_pixels(temp, src1, src2, stride);
+
+ last= s->fast_dct_quantize(s, temp, 0/*FIXME*/, s->qscale, &i);
+
+ bits=0;
+ if(last>=0){
+ run=0;
+ for(i=start_i; i<last; i++){
+ int j= scantable[i];
+ level= temp[j];
+
+ if(level){
+ level+=64;
+ if((level&(~127)) == 0){
+ bits+= length[UNI_AC_ENC_INDEX(run, level)];
+ }else
+ bits+= esc_length;
+ run=0;
+ }else
+ run++;
+ }
+ i= scantable[last];
+
+ assert(level);
+
+ level= temp[i] + 64;
+ if((level&(~127)) == 0){
+ bits+= last_length[UNI_AC_ENC_INDEX(run, level)];
+ }else
+ bits+= esc_length;
+ }
+
+ return bits;
+}
+
+
WARPER88_1616(hadamard8_diff_c, hadamard8_diff16_c)
WARPER88_1616(dct_sad8x8_c, dct_sad16x16_c)
WARPER88_1616(quant_psnr8x8_c, quant_psnr16x16_c)
+WARPER88_1616(rd8x8_c, rd16x16_c)
+WARPER88_1616(bit8x8_c, bit16x16_c)
void dsputil_init(DSPContext* c, unsigned mask)
{
@@ -1961,7 +2088,13 @@ void dsputil_init(DSPContext* c, unsigned mask)
c->quant_psnr[0]= quant_psnr16x16_c;
c->quant_psnr[1]= quant_psnr8x8_c;
-
+
+ c->rd[0]= rd16x16_c;
+ c->rd[1]= rd8x8_c;
+
+ c->bit[0]= bit16x16_c;
+ c->bit[1]= bit8x8_c;
+
c->add_bytes= add_bytes_c;
c->diff_bytes= diff_bytes_c;
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index ad01095..23c4228 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -116,6 +116,8 @@ typedef struct DSPContext {
me_cmp_func hadamard8_diff[2];
me_cmp_func dct_sad[2];
me_cmp_func quant_psnr[2];
+ me_cmp_func bit[2];
+ me_cmp_func rd[2];
int (*hadamard8_abs )(uint8_t *src, int stride, int mean);
me_cmp_func me_pre_cmp[11];
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index 8310db8..4dcc08d 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -286,6 +286,14 @@ static void set_cmp(MpegEncContext *s, me_cmp_func *cmp, int type){
cmp[0]= c->quant_psnr[0];
cmp[1]= c->quant_psnr[1];
break;
+ case FF_CMP_BIT:
+ cmp[0]= c->bit[0];
+ cmp[1]= c->bit[1];
+ break;
+ case FF_CMP_RD:
+ cmp[0]= c->rd[0];
+ cmp[1]= c->rd[1];
+ break;
case FF_CMP_ZERO:
for(i=0; i<7; i++){
cmp[i]= zero_cmp;
@@ -302,11 +310,14 @@ static inline int get_penalty_factor(MpegEncContext *s, int type){
default:
case FF_CMP_SAD:
return s->qscale;
- case FF_CMP_SSE:
-// return s->qscale*8;
case FF_CMP_DCT:
case FF_CMP_SATD:
+ case FF_CMP_SSE:
return s->qscale*8;
+ case FF_CMP_BIT:
+ return 1;
+ case FF_CMP_RD:
+ return (s->qscale*s->qscale*105 + 64)>>7;
}
}
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 218cbef..44d88f2 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -232,6 +232,8 @@ int DCT_common_init(MpegEncContext *s)
MPV_common_init_ppc(s);
#endif
+ s->fast_dct_quantize= s->dct_quantize;
+
if(s->flags&CODEC_FLAG_TRELLIS_QUANT){
s->dct_quantize= dct_quantize_trellis_c; //move before MPV_common_init_*
}
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index e76996a..6f9d5b6 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -552,6 +552,7 @@ typedef struct MpegEncContext {
void (*dct_unquantize)(struct MpegEncContext *s, // unquantizer to use (mpeg4 can use both)
DCTELEM *block/*align 16*/, int n, int qscale);
int (*dct_quantize)(struct MpegEncContext *s, DCTELEM *block/*align 16*/, int n, int qscale, int *overflow);
+ int (*fast_dct_quantize)(struct MpegEncContext *s, DCTELEM *block/*align 16*/, int n, int qscale, int *overflow);
void (*fdct)(DCTELEM *block/* align 16*/);
void (*idct_put)(UINT8 *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/);
void (*idct_add)(UINT8 *dest/*align 8*/, int line_size, DCTELEM *block/*align 16*/);
OpenPOWER on IntegriCloud