Mercurial > libavcodec.hg
changeset 1007:b2cf2a1d9a51 libavcodec
more compare functions (rd & bit)
| author | michaelni |
|---|---|
| date | Wed, 15 Jan 2003 18:05:23 +0000 |
| parents | a32feda30b01 |
| children | fb6cbb8a04a3 |
| files | dsputil.c dsputil.h motion_est.c mpegvideo.c mpegvideo.h |
| diffstat | 5 files changed, 153 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/dsputil.c Tue Jan 14 19:25:05 2003 +0000 +++ b/dsputil.c Wed Jan 15 18:05:23 2003 +0000 @@ -1835,7 +1835,7 @@ 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 @@ 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 @@ 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;
--- a/dsputil.h Tue Jan 14 19:25:05 2003 +0000 +++ b/dsputil.h Wed Jan 15 18:05:23 2003 +0000 @@ -116,6 +116,8 @@ 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];
--- a/motion_est.c Tue Jan 14 19:25:05 2003 +0000 +++ b/motion_est.c Wed Jan 15 18:05:23 2003 +0000 @@ -286,6 +286,14 @@ 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 @@ 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; } }
--- a/mpegvideo.c Tue Jan 14 19:25:05 2003 +0000 +++ b/mpegvideo.c Wed Jan 15 18:05:23 2003 +0000 @@ -232,6 +232,8 @@ 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_* }
--- a/mpegvideo.h Tue Jan 14 19:25:05 2003 +0000 +++ b/mpegvideo.h Wed Jan 15 18:05:23 2003 +0000 @@ -552,6 +552,7 @@ 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*/);