From c8f83a4c78e429ebd6184e5cd663fdf65c48b9cc Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 11 Jan 2015 00:16:41 +0100 Subject: avformat/voc: add seeking support Fixes Ticket1333 Signed-off-by: Michael Niedermayer --- libavformat/vocdec.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) (limited to 'libavformat/vocdec.c') diff --git a/libavformat/vocdec.c b/libavformat/vocdec.c index 0b6b5a59ae..c49ed163cb 100644 --- a/libavformat/vocdec.c +++ b/libavformat/vocdec.c @@ -71,6 +71,15 @@ ff_voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size) int size, tmp_codec=-1; int sample_rate = 0; int channels = 1; + int64_t duration; + int ret; + + av_add_index_entry(st, + avio_tell(pb), + voc->pts, + voc->remaining_size, + 0, + AVINDEX_KEYFRAME); while (!voc->remaining_size) { type = avio_r8(pb); @@ -156,7 +165,17 @@ ff_voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size) max_size = 2048; size = FFMIN(voc->remaining_size, max_size); voc->remaining_size -= size; - return av_get_packet(pb, pkt, size); + + ret = av_get_packet(pb, pkt, size); + pkt->dts = pkt->pts = voc->pts; + + duration = av_get_audio_frame_duration(st->codec, size); + if (duration > 0 && voc->pts != AV_NOPTS_VALUE) + voc->pts += duration; + else + voc->pts = AV_NOPTS_VALUE; + + return ret; } static int voc_read_packet(AVFormatContext *s, AVPacket *pkt) @@ -164,6 +183,28 @@ static int voc_read_packet(AVFormatContext *s, AVPacket *pkt) return ff_voc_get_packet(s, pkt, s->streams[0], 0); } +static int voc_read_seek(AVFormatContext *s, int stream_index, + int64_t timestamp, int flags) +{ + VocDecContext *voc = s->priv_data; + AVStream *st = s->streams[stream_index]; + int index = av_index_search_timestamp(st, timestamp, flags); + + if (index >= 0 && index < st->nb_index_entries - 1) { + AVIndexEntry *e = &st->index_entries[index]; + avio_seek(s->pb, e->pos, SEEK_SET); + voc->pts = e->timestamp; + voc->remaining_size = e->size; + return 0; + } else if (st->nb_index_entries && st->index_entries[0].timestamp <= timestamp) { + AVIndexEntry *e = &st->index_entries[st->nb_index_entries - 1]; + // prepare context for seek_frame_generic() + voc->pts = e->timestamp; + voc->remaining_size = e->size; + } + return -1; +} + AVInputFormat ff_voc_demuxer = { .name = "voc", .long_name = NULL_IF_CONFIG_SMALL("Creative Voice"), @@ -171,5 +212,6 @@ AVInputFormat ff_voc_demuxer = { .read_probe = voc_probe, .read_header = voc_read_header, .read_packet = voc_read_packet, + .read_seek = voc_read_seek, .codec_tag = (const AVCodecTag* const []){ ff_voc_codec_tags, 0 }, }; -- cgit v1.2.3