diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-20 22:00:52 +0200 |
|---|---|---|
| committer | Reinhard Tartler <siretart@tauware.de> | 2013-04-19 20:26:56 +0200 |
| commit | c8462bd17f35f435192281a2ea4ce8008a7398d3 (patch) | |
| tree | ec1e9de893725caca2db46f4b03d82d508d2f4b3 | |
| parent | a3410b5a1fcb4e965ceb40aa4d4a935df8a32f05 (diff) | |
| download | ffmpeg-c8462bd17f35f435192281a2ea4ce8008a7398d3.tar.gz | |
mp3dec: fallback to generic seeking when a TOC is not present
Fixes seeking without a Xing/Info header.
CC: libav-stable@libav.org
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 505642f18276aed03278ac91b1f334ea888eac6a)
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
| -rw-r--r-- | libavformat/mp3dec.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 48deefd126..9da9aa8b16 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 */ }; |