[FFmpeg-cvslog] mp3dec: fallback to generic seeking when a TOC is not present

[Michael Niedermayer]

ffmpeg | branch: release/1.1 | Michael Niedermayer <michaelni at gmx.at> | Thu Sep 20 22:00:52 2012 +0200| [c8462bd17f35f435192281a2ea4ce8008a7398d3] | committer: Reinhard Tartler

mp3dec: fallback to generic seeking when a TOC is not present

Fixes seeking without a Xing/Info header.

CC: libav-stable at libav.org
Signed-off-by: Anton Khirnov <anton at khirnov.net>
(cherry picked from commit 505642f18276aed03278ac91b1f334ea888eac6a)

Signed-off-by: Reinhard Tartler <siretart at tauware.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c8462bd17f35f435192281a2ea4ce8008a7398d3
---

 libavformat/mp3dec.c |   11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c
index 48deefd..9da9aa8 100644
--- a/libavformat/mp3dec.c
+++ b/libavformat/mp3dec.c
@@ -35,6 +35,10 @@
 
 #define XING_TOC_COUNT 100
 
+typedef struct MP3DecContext {
+    int xing_toc;
+} MP3DecContext;
+
 /* mp3 read */
 
 static int mp3_read_probe(AVProbeData *p)
@@ -100,6 +104,7 @@ static int mp3_read_probe(AVProbeData *p)
 static void read_xing_toc(AVFormatContext *s, int64_t filesize, int64_t duration)
 {
     int i;
+    MP3DecContext *mp3 = s->priv_data;
 
     if (!filesize &&
         !(filesize = avio_size(s->pb))) {
@@ -115,6 +120,7 @@ static void read_xing_toc(AVFormatContext *s, int64_t filesize, int64_t duration
                            av_rescale(i, duration, XING_TOC_COUNT),
                            0, 0, AVINDEX_KEYFRAME);
     }
+    mp3->xing_toc = 1;
 }
 
 /**
@@ -238,11 +244,15 @@ static int mp3_read_packet(AVFormatContext *s, AVPacket *pkt)
 static int mp3_seek(AVFormatContext *s, int stream_index, int64_t timestamp,
                     int flags)
 {
+    MP3DecContext *mp3 = s->priv_data;
     AVIndexEntry *ie;
     AVStream *st = s->streams[0];
     int64_t ret  = av_index_search_timestamp(st, timestamp, flags);
     uint32_t header = 0;
 
+    if (!mp3->xing_toc)
+        return AVERROR(ENOSYS);
+
     if (ret < 0)
         return ret;
 
@@ -270,6 +280,7 @@ AVInputFormat ff_mp3_demuxer = {
     .read_header    = mp3_read_header,
     .read_packet    = mp3_read_packet,
     .read_seek      = mp3_seek,
+    .priv_data_size = sizeof(MP3DecContext),
     .flags          = AVFMT_GENERIC_INDEX,
     .extensions     = "mp2,mp3,m2a", /* XXX: use probe */
 };