generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Fixes seeking without a Xing/Info header.

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

Signed-off-by: Reinhard Tartler <siretart@tauware.de>
This commit is contained in:
Michael Niedermayer
2012-09-20 22:00:52 +02:00
committed by Reinhard Tartler
parent a3410b5a1f
commit c8462bd17f
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/mp3dec.c
View File

@@ -35,6 +35,10 @@
#define XING_TOC_COUNT 100 #define XING_TOC_COUNT 100
typedef struct MP3DecContext {
int xing_toc;
} MP3DecContext;
/* mp3 read */ /* mp3 read */
static int mp3_read_probe(AVProbeData *p) 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) static void read_xing_toc(AVFormatContext *s, int64_t filesize, int64_t duration)
{ {
int i; int i;
MP3DecContext *mp3 = s->priv_data;
if (!filesize && if (!filesize &&
!(filesize = avio_size(s->pb))) { !(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), av_rescale(i, duration, XING_TOC_COUNT),
0, 0, AVINDEX_KEYFRAME); 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, static int mp3_seek(AVFormatContext *s, int stream_index, int64_t timestamp,
int flags) int flags)
{ {
MP3DecContext *mp3 = s->priv_data;
AVIndexEntry *ie; AVIndexEntry *ie;
AVStream *st = s->streams[0]; AVStream *st = s->streams[0];
int64_t ret = av_index_search_timestamp(st, timestamp, flags); int64_t ret = av_index_search_timestamp(st, timestamp, flags);
uint32_t header = 0; uint32_t header = 0;
if (!mp3->xing_toc)
return AVERROR(ENOSYS);
if (ret < 0) if (ret < 0)
return ret; return ret;
@@ -270,6 +280,7 @@ AVInputFormat ff_mp3_demuxer = {
.read_header = mp3_read_header, .read_header = mp3_read_header,
.read_packet = mp3_read_packet, .read_packet = mp3_read_packet,
.read_seek = mp3_seek, .read_seek = mp3_seek,
.priv_data_size = sizeof(MP3DecContext),
.flags = AVFMT_GENERIC_INDEX, .flags = AVFMT_GENERIC_INDEX,
.extensions = "mp2,mp3,m2a", /* XXX: use probe */ .extensions = "mp2,mp3,m2a", /* XXX: use probe */
}; };