eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-23 23:40:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Typo: distoration -> distortion.

Browse Source 
Originally committed as revision 13019 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ramiro Polla
2008-04-29 14:08:01 +00:00
parent 34d71ebe94
commit e6dba5dfab
3 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/mpegvideo_enc.c
View File

@@ -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;