virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat/mp3dec: fix gapless audio when seeking in CBR mode

Browse Source 
Removing a bunch of questionable hacks makes it work. These hacks
apparently try to make concatenated mp3s with Lame headers seekable,
which doesn't make too much sense anyway. The main change is that we
trust the Xing header file size field now (the same field is used for
seeking with Xing TOC). Note that a mp3 might contain an unknown number
of unsupported additional tags, so we can't reliably compute this size
manually.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
wm4
2015-04-17 17:27:00 +02:00
committed by Michael Niedermayer
parent 4efc0e6451
commit 92eef26e67
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/mp3dec.c
View File

@@ -437,16 +437,10 @@ static int mp3_seek(AVFormatContext *s, int stream_index, int64_t timestamp,
&& st->duration > 0
&& mp3->header_filesize > s->internal->data_offset
&& mp3->frames) {
int64_t filesize = avio_size(s->pb);
int64_t duration;
if (filesize <= s->internal->data_offset)
filesize = mp3->header_filesize;
filesize -= s->internal->data_offset;
duration = av_rescale(st->duration, filesize, mp3->header_filesize - s->internal->data_offset);
ie = &ie1;
timestamp = av_clip64(timestamp, 0, duration);
timestamp = av_clip64(timestamp, 0, st->duration);
ie->timestamp = timestamp;
ie->pos = av_rescale(timestamp, filesize, duration) + s->internal->data_offset;
ie->pos = av_rescale(timestamp, mp3->header_filesize, st->duration) + s->internal->data_offset;
} else if (mp3->xing_toc) {
if (ret < 0)
return ret;