diff options
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavcodec/dsputil.c | 6 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 20 |
3 files changed, 14 insertions, 14 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index dfdef6732f..8d8b635604 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1699,7 +1699,7 @@ typedef struct AVCodecContext { int mb_decision; #define FF_MB_DECISION_SIMPLE 0 ///< uses mb_cmp #define FF_MB_DECISION_BITS 1 ///< chooses the one which needs the fewest bits -#define FF_MB_DECISION_RD 2 ///< rate distoration +#define FF_MB_DECISION_RD 2 ///< rate distortion /** * custom intra quantization matrix diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 6c734e570e..80efd07825 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -3698,7 +3698,7 @@ static int rd8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int DECLARE_ALIGNED_8 (uint64_t, aligned_bak[stride]); DCTELEM * const temp= (DCTELEM*)aligned_temp; uint8_t * const bak= (uint8_t*)aligned_bak; - int i, last, run, bits, level, distoration, start_i; + int i, last, run, bits, level, distortion, start_i; const int esc_length= s->ac_esc_length; uint8_t * length; uint8_t * last_length; @@ -3765,9 +3765,9 @@ static int rd8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int s->dsp.idct_add(bak, stride, temp); - distoration= s->dsp.sse[1](NULL, bak, src1, stride, 8); + distortion= s->dsp.sse[1](NULL, bak, src1, stride, 8); - return distoration + ((bits*s->qscale*s->qscale*109 + 64)>>7); + return distortion + ((bits*s->qscale*s->qscale*109 + 64)>>7); } static int bit8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){ diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index af6e43b440..8b6aa4330b 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -2742,7 +2742,7 @@ static int encode_picture(MpegEncContext *s, int picture_number) s->me.scene_change_score=0; -// s->lambda= s->current_picture_ptr->quality; //FIXME qscale / ... stuff for ME ratedistoration +// s->lambda= s->current_picture_ptr->quality; //FIXME qscale / ... stuff for ME rate distortion if(s->pict_type==FF_I_TYPE){ if(s->msmpeg4_version >= 3) s->no_rounding=1; @@ -3078,7 +3078,7 @@ int dct_quantize_trellis_c(MpegEncContext *s, survivor_count= 1; for(i=start_i; i<=last_non_zero; i++){ - int level_index, j, zero_distoration; + int level_index, j, zero_distortion; int dct_coeff= FFABS(block[ scantable[i] ]); int best_score=256*256*256*120; @@ -3088,10 +3088,10 @@ int dct_quantize_trellis_c(MpegEncContext *s, #endif ) dct_coeff= (dct_coeff*inv_aanscales[ scantable[i] ]) >> 12; - zero_distoration= dct_coeff*dct_coeff; + zero_distortion= dct_coeff*dct_coeff; for(level_index=0; level_index < coeff_count[i]; level_index++){ - int distoration; + int distortion; int level= coeff[level_index][i]; const int alevel= FFABS(level); int unquant_coeff; @@ -3112,12 +3112,12 @@ int dct_quantize_trellis_c(MpegEncContext *s, unquant_coeff<<= 3; } - distoration= (unquant_coeff - dct_coeff) * (unquant_coeff - dct_coeff) - zero_distoration; + distortion= (unquant_coeff - dct_coeff) * (unquant_coeff - dct_coeff) - zero_distortion; level+=64; if((level&(~127)) == 0){ for(j=survivor_count-1; j>=0; j--){ int run= i - survivor[j]; - int score= distoration + length[UNI_AC_ENC_INDEX(run, level)]*lambda; + int score= distortion + length[UNI_AC_ENC_INDEX(run, level)]*lambda; score += score_tab[i-run]; if(score < best_score){ @@ -3130,7 +3130,7 @@ int dct_quantize_trellis_c(MpegEncContext *s, if(s->out_format == FMT_H263){ for(j=survivor_count-1; j>=0; j--){ int run= i - survivor[j]; - int score= distoration + last_length[UNI_AC_ENC_INDEX(run, level)]*lambda; + int score= distortion + last_length[UNI_AC_ENC_INDEX(run, level)]*lambda; score += score_tab[i-run]; if(score < last_score){ last_score= score; @@ -3141,10 +3141,10 @@ int dct_quantize_trellis_c(MpegEncContext *s, } } }else{ - distoration += esc_length*lambda; + distortion += esc_length*lambda; for(j=survivor_count-1; j>=0; j--){ int run= i - survivor[j]; - int score= distoration + score_tab[i-run]; + int score= distortion + score_tab[i-run]; if(score < best_score){ best_score= score; @@ -3156,7 +3156,7 @@ int dct_quantize_trellis_c(MpegEncContext *s, if(s->out_format == FMT_H263){ for(j=survivor_count-1; j>=0; j--){ int run= i - survivor[j]; - int score= distoration + score_tab[i-run]; + int score= distortion + score_tab[i-run]; if(score < last_score){ last_score= score; last_run= run; |