RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-16 20:35:23 +00:00
Code Issues Projects Releases Wiki Activity

detect a few more errors (fixes libmp3-bug.avi again)

Browse Source 
make pickyness of the decoder user selectable through error_resilience param like for video decoders

Originally committed as revision 7089 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2006-11-15 17:58:35 +00:00
parent 4e762357ee
commit 8e5606bfcd
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/mpegaudiodec.c
View File

@ -89,6 +89,7 @@ typedef struct MPADecodeContext {
void (*compute_antialias)(struct MPADecodeContext *s, struct GranuleDef *g); void (*compute_antialias)(struct MPADecodeContext *s, struct GranuleDef *g);
int adu_mode; ///< 0 for standard mp3, 1 for adu formatted mp3 int adu_mode; ///< 0 for standard mp3, 1 for adu formatted mp3
int dither_state; int dither_state;
int error_resilience;
} MPADecodeContext; } MPADecodeContext;
/** /**
@ -305,6 +306,7 @@ static int decode_init(AVCodecContext * avctx)
#else #else
avctx->sample_fmt= SAMPLE_FMT_S16; avctx->sample_fmt= SAMPLE_FMT_S16;
#endif #endif
s->error_resilience= avctx->error_resilience;
if(avctx->antialias_algo != FF_AA_FLOAT) if(avctx->antialias_algo != FF_AA_FLOAT)
s->compute_antialias= compute_antialias_integer; s->compute_antialias= compute_antialias_integer;
@ -1705,6 +1707,8 @@ static int huffman_decode(MPADecodeContext *s, GranuleDef *g,
s_index -= 4; s_index -= 4;
skip_bits_long(&s->gb, last_pos - pos); skip_bits_long(&s->gb, last_pos - pos);
av_log(NULL, AV_LOG_INFO, "overread, skip %d enddists: %d %d\n", last_pos - pos, end_pos-pos, end_pos2-pos); av_log(NULL, AV_LOG_INFO, "overread, skip %d enddists: %d %d\n", last_pos - pos, end_pos-pos, end_pos2-pos);
if(s->error_resilience >= FF_ER_COMPLIANT)
s_index=0;
break; break;
} }
// av_log(NULL, AV_LOG_ERROR, "pos2: %d %d %d %d\n", pos, end_pos, end_pos2, s_index); // av_log(NULL, AV_LOG_ERROR, "pos2: %d %d %d %d\n", pos, end_pos, end_pos2, s_index);
@ -1742,14 +1746,17 @@ static int huffman_decode(MPADecodeContext *s, GranuleDef *g,
} }
s_index+=4; s_index+=4;
} }
memset(&g->sb_hybrid[s_index], 0, sizeof(*g->sb_hybrid)*(576 - s_index));
/* skip extension bits */ /* skip extension bits */
bits_left = end_pos - get_bits_count(&s->gb); bits_left = end_pos - get_bits_count(&s->gb);
//av_log(NULL, AV_LOG_ERROR, "left:%d buf:%p\n", bits_left, s->in_gb.buffer); //av_log(NULL, AV_LOG_ERROR, "left:%d buf:%p\n", bits_left, s->in_gb.buffer);
if (bits_left < 0) { if (bits_left < 0 || bits_left > 16) {
av_log(NULL, AV_LOG_ERROR, "bits_left=%d\n", bits_left); av_log(NULL, AV_LOG_ERROR, "bits_left=%d\n", bits_left);
s_index=0;
}else if(bits_left > 0 && s->error_resilience >= FF_ER_AGGRESSIVE){
av_log(NULL, AV_LOG_ERROR, "bits_left=%d\n", bits_left);
s_index=0;
} }
memset(&g->sb_hybrid[s_index], 0, sizeof(*g->sb_hybrid)*(576 - s_index));
skip_bits_long(&s->gb, bits_left); skip_bits_long(&s->gb, bits_left);
return 0; return 0;