virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Code Issues Releases 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/avcodec.h
View File

@ -1699,7 +1699,7 @@ typedef struct AVCodecContext {
int mb_decision; int mb_decision;
#define FF_MB_DECISION_SIMPLE 0 ///< uses mb_cmp #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_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 * custom intra quantization matrix

6
libavcodec/dsputil.c
View File

@ -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]); DECLARE_ALIGNED_8 (uint64_t, aligned_bak[stride]);
DCTELEM * const temp= (DCTELEM*)aligned_temp; DCTELEM * const temp= (DCTELEM*)aligned_temp;
uint8_t * const bak= (uint8_t*)aligned_bak; 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; const int esc_length= s->ac_esc_length;
uint8_t * length; uint8_t * length;
uint8_t * last_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); 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){ static int bit8x8_c(/*MpegEncContext*/ void *c, uint8_t *src1, uint8_t *src2, int stride, int h){

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->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->pict_type==FF_I_TYPE){
if(s->msmpeg4_version >= 3) s->no_rounding=1; if(s->msmpeg4_version >= 3) s->no_rounding=1;
@ -3078,7 +3078,7 @@ int dct_quantize_trellis_c(MpegEncContext *s,
survivor_count= 1; survivor_count= 1;
for(i=start_i; i<=last_non_zero; i++){ 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 dct_coeff= FFABS(block[ scantable[i] ]);
int best_score=256*256*256*120; int best_score=256*256*256*120;
@ -3088,10 +3088,10 @@ int dct_quantize_trellis_c(MpegEncContext *s,
#endif #endif
) )
dct_coeff= (dct_coeff*inv_aanscales[ scantable[i] ]) >> 12; 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++){ for(level_index=0; level_index < coeff_count[i]; level_index++){
int distoration; int distortion;
int level= coeff[level_index][i]; int level= coeff[level_index][i];
const int alevel= FFABS(level); const int alevel= FFABS(level);
int unquant_coeff; int unquant_coeff;
@ -3112,12 +3112,12 @@ int dct_quantize_trellis_c(MpegEncContext *s,
unquant_coeff<<= 3; 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; level+=64;
if((level&(~127)) == 0){ if((level&(~127)) == 0){
for(j=survivor_count-1; j>=0; j--){ for(j=survivor_count-1; j>=0; j--){
int run= i - survivor[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]; score += score_tab[i-run];
if(score < best_score){ if(score < best_score){
@ -3130,7 +3130,7 @@ int dct_quantize_trellis_c(MpegEncContext *s,
if(s->out_format == FMT_H263){ if(s->out_format == FMT_H263){
for(j=survivor_count-1; j>=0; j--){ for(j=survivor_count-1; j>=0; j--){
int run= i - survivor[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]; score += score_tab[i-run];
if(score < last_score){ if(score < last_score){
last_score= score; last_score= score;
@ -3141,10 +3141,10 @@ int dct_quantize_trellis_c(MpegEncContext *s,
} }
} }
}else{ }else{
distoration += esc_length*lambda; distortion += esc_length*lambda;
for(j=survivor_count-1; j>=0; j--){ for(j=survivor_count-1; j>=0; j--){
int run= i - survivor[j]; int run= i - survivor[j];
int score= distoration + score_tab[i-run]; int score= distortion + score_tab[i-run];
if(score < best_score){ if(score < best_score){
best_score= score; best_score= score;
@ -3156,7 +3156,7 @@ int dct_quantize_trellis_c(MpegEncContext *s,
if(s->out_format == FMT_H263){ if(s->out_format == FMT_H263){
for(j=survivor_count-1; j>=0; j--){ for(j=survivor_count-1; j>=0; j--){
int run= i - survivor[j]; int run= i - survivor[j];
int score= distoration + score_tab[i-run]; int score= distortion + score_tab[i-run];
if(score < last_score){ if(score < last_score){
last_score= score; last_score= score;
last_run= run; last_run= run;