Mercurial > libavcodec.hg
changeset 4205:8c28f03cfdd5 libavcodec
detect a few more errors (fixes libmp3-bug.avi again)
make pickyness of the decoder user selectable through error_resilience param like for video decoders
| author | michael |
|---|---|
| date | Wed, 15 Nov 2006 17:58:35 +0000 |
| parents | 672724df5c9a |
| children | be94e97ecb6e |
| files | mpegaudiodec.c |
| diffstat | 1 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/mpegaudiodec.c Tue Nov 14 22:06:28 2006 +0000 +++ b/mpegaudiodec.c Wed Nov 15 17:58:35 2006 +0000 @@ -89,6 +89,7 @@ void (*compute_antialias)(struct MPADecodeContext *s, struct GranuleDef *g); int adu_mode; ///< 0 for standard mp3, 1 for adu formatted mp3 int dither_state; + int error_resilience; } MPADecodeContext; /** @@ -305,6 +306,7 @@ #else avctx->sample_fmt= SAMPLE_FMT_S16; #endif + s->error_resilience= avctx->error_resilience; if(avctx->antialias_algo != FF_AA_FLOAT) s->compute_antialias= compute_antialias_integer; @@ -1705,6 +1707,8 @@ s_index -= 4; 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); + if(s->error_resilience >= FF_ER_COMPLIANT) + s_index=0; break; } // av_log(NULL, AV_LOG_ERROR, "pos2: %d %d %d %d\n", pos, end_pos, end_pos2, s_index); @@ -1742,14 +1746,17 @@ } s_index+=4; } - memset(&g->sb_hybrid[s_index], 0, sizeof(*g->sb_hybrid)*(576 - s_index)); - /* skip extension bits */ 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); - if (bits_left < 0) { + if (bits_left < 0 || bits_left > 16) { 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); return 0;