RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Ignore xing number of frames if the file is larger than indicated. 

Fixes ticket #3777.
This commit is contained in:
Carl Eugen Hoyos 2014-07-24 15:34:36 +02:00
parent badcd3da81
commit ef21b3d38e
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavformat/mp3dec.c
View File

@ -138,6 +138,7 @@ static void mp3_parse_info_tag(AVFormatContext *s, AVStream *st,
MP3DecContext *mp3 = s->priv_data; MP3DecContext *mp3 = s->priv_data;
static const int64_t xing_offtbl[2][2] = {{32, 17}, {17,9}}; static const int64_t xing_offtbl[2][2] = {{32, 17}, {17,9}};
uint64_t fsize = avio_size(s->pb);
/* Check for Xing / Info tag */ /* Check for Xing / Info tag */
avio_skip(s->pb, xing_offtbl[c->lsf == 1][c->nb_channels == 1]); avio_skip(s->pb, xing_offtbl[c->lsf == 1][c->nb_channels == 1]);
@ -151,6 +152,17 @@ static void mp3_parse_info_tag(AVFormatContext *s, AVStream *st,
mp3->frames = avio_rb32(s->pb); mp3->frames = avio_rb32(s->pb);
if (v & XING_FLAG_SIZE) if (v & XING_FLAG_SIZE)
mp3->header_filesize = avio_rb32(s->pb); mp3->header_filesize = avio_rb32(s->pb);
if (fsize && mp3->header_filesize) {
uint64_t min, delta;
min = FFMIN(fsize, mp3->header_filesize);
delta = FFMAX(fsize, mp3->header_filesize) - min;
if (fsize > mp3->header_filesize && delta > min >> 4) {
mp3->frames = 0;
} else if (delta > min >> 4) {
av_log(s, AV_LOG_WARNING,
"filesize and duration do not match (growing file?)\n");
}
}
if (v & XING_FLAG_TOC) if (v & XING_FLAG_TOC)
read_xing_toc(s, mp3->header_filesize, av_rescale_q(mp3->frames, read_xing_toc(s, mp3->header_filesize, av_rescale_q(mp3->frames,
(AVRational){spf, c->sample_rate}, (AVRational){spf, c->sample_rate},
@ -399,7 +411,10 @@ static int mp3_seek(AVFormatContext *s, int stream_index, int64_t timestamp,
int i, j; int i, j;
int dir = (flags&AVSEEK_FLAG_BACKWARD) ? -1 : 1; int dir = (flags&AVSEEK_FLAG_BACKWARD) ? -1 : 1;
if (mp3->is_cbr && st->duration > 0 && mp3->header_filesize > s->data_offset) { if ( mp3->is_cbr
&& st->duration > 0
&& mp3->header_filesize > s->data_offset
&& mp3->frames) {
int64_t filesize = avio_size(s->pb); int64_t filesize = avio_size(s->pb);
int64_t duration; int64_t duration;
if (filesize <= s->data_offset) if (filesize <= s->data_offset)