Re: [FFmpeg-devel] [PATCH]Ignore xing number of frames if filesize is wrong

[Carl Eugen Hoyos]

On Saturday 19 July 2014 04:40:47 pm Joakim Plate wrote:
> Carl Eugen Hoyos <cehoyos <at> ag.or.at> writes:
> > Hi!
> >
> > Attached patch fixes ticket #3777 for me, analyzed by Oliver Fromme.
>
> What about streaming growing files? It's pretty good to know number of
> frames of the complete mp3 at start of playback?

This is true (ticket #2590 contains an example).

New patch attached.

Please review, Carl Eugen

diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index 8335388..4016e94 100644
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -138,6 +138,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 min, delta, fsize;
 
     /* Check for Xing / Info tag */
     avio_skip(s->pb, xing_offtbl[c->lsf == 1][c->nb_channels == 1]);
@@ -151,6 +152,15 @@ static void mp3_parse_info_tag(AVFormatContext *s, 
AVStream *st,
         mp3->frames = avio_rb32(s->pb);
     if (v & XING_FLAG_SIZE)
         mp3->header_filesize = avio_rb32(s->pb);
+    fsize = avio_size(s->pb);
+    min = FFMIN(fsize, mp3->header_filesize);
+    delta = FFMAX(fsize, mp3->header_filesize) - min;
+    if (fsize && fsize > mp3->header_filesize && delta > min >> 4) {
+        mp3->frames = 0;
+    } else if (fsize && delta > min >> 4) {
+        av_log(s, AV_LOG_WARNING,
+               "filesize and duration do not match (growing file?)\n");
+    }
     if (v & XING_FLAG_TOC)
         read_xing_toc(s, mp3->header_filesize, av_rescale_q(mp3->frames,
                                        (AVRational){spf, c->sample_rate},
@@ -399,7 +409,10 @@ static int mp3_seek(AVFormatContext *s, int stream_index, 
int64_t timestamp,
     int i, j;
     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 duration;
         if (filesize <= s->data_offset)

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel