virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

padding bug autodetection improvement 2nd try

Browse Source 
Originally committed as revision 1458 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2003-01-13 13:20:21 +00:00
parent 650faac6de
commit cb7c98d6e2
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libavcodec/h263dec.c
View File

@ -144,8 +144,6 @@ static int get_consumed_bytes(MpegEncContext *s, int buf_size){
} }
static int decode_slice(MpegEncContext *s){ static int decode_slice(MpegEncContext *s){
const int workaround_bugs= s->workaround_bugs;
s->last_resync_gb= s->gb; s->last_resync_gb= s->gb;
s->first_slice_line= 1; s->first_slice_line= 1;
@ -272,15 +270,10 @@ static int decode_slice(MpegEncContext *s){
else else
s->padding_bug_score++; s->padding_bug_score++;
} }
if(s->padding_bug_score > -2)
s->workaround_bugs |= FF_BUG_NO_PADDING;
else
s->workaround_bugs &= ~FF_BUG_NO_PADDING;
} }
// handle formats which dont have unique end markers // handle formats which dont have unique end markers
if(s->msmpeg4_version || (workaround_bugs&FF_BUG_NO_PADDING)){ //FIXME perhaps solve this more cleanly if(s->msmpeg4_version || (s->workaround_bugs&FF_BUG_NO_PADDING)){ //FIXME perhaps solve this more cleanly
int left= s->gb.size*8 - get_bits_count(&s->gb); int left= s->gb.size*8 - get_bits_count(&s->gb);
int max_extra=7; int max_extra=7;
@ -289,9 +282,9 @@ static int decode_slice(MpegEncContext *s){
max_extra+= 17; max_extra+= 17;
/* buggy padding but the frame should still end approximately at the bitstream end */ /* buggy padding but the frame should still end approximately at the bitstream end */
if((workaround_bugs&FF_BUG_NO_PADDING) && s->error_resilience>=3) if((s->workaround_bugs&FF_BUG_NO_PADDING) && s->error_resilience>=3)
max_extra+= 48; max_extra+= 48;
else if((workaround_bugs&FF_BUG_NO_PADDING)) else if((s->workaround_bugs&FF_BUG_NO_PADDING))
max_extra+= 256*256*256*64; max_extra+= 256*256*256*64;
if(left>max_extra){ if(left>max_extra){
@ -482,6 +475,11 @@ retry:
avctx->has_b_frames= !s->low_delay; avctx->has_b_frames= !s->low_delay;
if(s->workaround_bugs&FF_BUG_AUTODETECT){ if(s->workaround_bugs&FF_BUG_AUTODETECT){
if(s->padding_bug_score > -2 && !s->data_partitioning)
s->workaround_bugs |= FF_BUG_NO_PADDING;
else
s->workaround_bugs &= ~FF_BUG_NO_PADDING;
if(s->avctx->fourcc == ff_get_fourcc("XVIX")) if(s->avctx->fourcc == ff_get_fourcc("XVIX"))
s->workaround_bugs|= FF_BUG_XVID_ILACE; s->workaround_bugs|= FF_BUG_XVID_ILACE;
#if 0 #if 0