diff options
| author | wm4 <nfxjfg@googlemail.com> | 2015-04-24 12:26:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-24 15:06:54 +0200 |
| commit | 537ab680534e53bd298ba3f62d4aabb56afcd403 (patch) | |
| tree | 3aeb01cf561225a8797751cac14df1eecc357a3a /libavformat/mp3dec.c | |
| parent | 00a452a9adea0ffb47de4b0a2a6eec1db2bf842f (diff) | |
| download | ffmpeg-537ab680534e53bd298ba3f62d4aabb56afcd403.tar.gz | |
avformat/mp3: large id3 tags break concatenated file detection
If the file size is much larger than what is indicated in the XING
header, the demuxer assumes it's a concatenated file, and throws away
the (presumably) incorrect duration information. Unfortunately, this
also triggers if the id3 tags are very large (embedded pictures and
such). Then the half-baked heuristic not only breaks the duration
display, but also gapless audio.
Fix it by subtracting the size of the headers (the check is off by some
bytes, but that doesn't matter at all). Note that there could be an
arbitrary amount of tags _after_ the mp3 data, but hopefully these are
not too large to trigger the heuristic in practice.
Also add a warning when this happens.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mp3dec.c')
| -rw-r--r-- | libavformat/mp3dec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 8c177764b3..abd7fc0bd3 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -147,6 +147,7 @@ static void mp3_parse_info_tag(AVFormatContext *s, AVStream *st, MP3DecContext *mp3 = s->priv_data; static const int64_t xing_offtbl[2][2] = {{32, 17}, {17,9}}; uint64_t fsize = avio_size(s->pb); + fsize = fsize >= avio_tell(s->pb) ? fsize - avio_tell(s->pb) : 0; /* Check for Xing / Info tag */ avio_skip(s->pb, xing_offtbl[c->lsf == 1][c->nb_channels == 1]); @@ -166,6 +167,8 @@ static void mp3_parse_info_tag(AVFormatContext *s, AVStream *st, delta = FFMAX(fsize, mp3->header_filesize) - min; if (fsize > mp3->header_filesize && delta > min >> 4) { mp3->frames = 0; + av_log(s, AV_LOG_WARNING, + "invalid concatenated file detected - using bitrate for duration\n"); } else if (delta > min >> 4) { av_log(s, AV_LOG_WARNING, "filesize and duration do not match (growing file?)\n"); |