generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rd cbp + single coeff elimination fix

Browse Source 
Originally committed as revision 2333 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2003-10-02 08:52:37 +00:00
parent 6955a88293
commit 16c3c1ecb4
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/mpegvideo.c
View File

@ -3025,12 +3025,6 @@ static void encode_mb(MpegEncContext *s, int motion_x, int motion_y)
}else }else
s->block_last_index[i]= -1; s->block_last_index[i]= -1;
} }
if(s->flags & CODEC_FLAG_CBP_RD){
for(i=0;i<6;i++) {
if(s->block_last_index[i] == -1)
s->coded_score[i]= INT_MAX/256;
}
}
if(s->luma_elim_threshold && !s->mb_intra) if(s->luma_elim_threshold && !s->mb_intra)
for(i=0; i<4; i++) for(i=0; i<4; i++)
@ -3038,6 +3032,13 @@ static void encode_mb(MpegEncContext *s, int motion_x, int motion_y)
if(s->chroma_elim_threshold && !s->mb_intra) if(s->chroma_elim_threshold && !s->mb_intra)
for(i=4; i<6; i++) for(i=4; i<6; i++)
dct_single_coeff_elimination(s, i, s->chroma_elim_threshold); dct_single_coeff_elimination(s, i, s->chroma_elim_threshold);
if(s->flags & CODEC_FLAG_CBP_RD){
for(i=0;i<6;i++) {
if(s->block_last_index[i] == -1)
s->coded_score[i]= INT_MAX/256;
}
}
} }
if((s->flags&CODEC_FLAG_GRAY) && s->mb_intra){ if((s->flags&CODEC_FLAG_GRAY) && s->mb_intra){