From 49543373f3e5871fe91e46b351d29e8f79441efc Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Wed, 1 Aug 2012 16:08:28 -0400 Subject: [PATCH 1/2] idcin: set AV_PKT_FLAG_KEY for video packets with a palette --- libavformat/idcin.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/idcin.c b/libavformat/idcin.c index 697b97290b..122fd8ebe4 100644 --- a/libavformat/idcin.c +++ b/libavformat/idcin.c @@ -290,6 +290,7 @@ static int idcin_read_packet(AVFormatContext *s, if (ret < 0) return ret; memcpy(pal, palette, AVPALETTE_SIZE); + pkt->flags |= AV_PKT_FLAG_KEY; } pkt->stream_index = idcin->video_stream_index; pkt->duration = 1; From 7040e479a1530b2eda4b89a182d5eb50a77bd907 Mon Sep 17 00:00:00 2001 From: Justin Ruggles Date: Wed, 1 Aug 2012 17:14:39 -0400 Subject: [PATCH 2/2] idcin: allow seeking back to the first packet Also, do not allow seek-by-byte, as there is no way to find the next packet boundary. --- libavformat/idcin.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/libavformat/idcin.c b/libavformat/idcin.c index 122fd8ebe4..7a0042b4a1 100644 --- a/libavformat/idcin.c +++ b/libavformat/idcin.c @@ -88,6 +88,7 @@ typedef struct IdcinDemuxContext { int current_audio_chunk; int next_chunk_is_video; int audio_present; + int64_t first_pkt_pos; } IdcinDemuxContext; static int idcin_probe(AVProbeData *p) @@ -230,6 +231,7 @@ static int idcin_read_header(AVFormatContext *s) } idcin->next_chunk_is_video = 1; + idcin->first_pkt_pos = avio_tell(s->pb); return 0; } @@ -315,6 +317,23 @@ static int idcin_read_packet(AVFormatContext *s, return ret; } +static int idcin_read_seek(AVFormatContext *s, int stream_index, + int64_t timestamp, int flags) +{ + IdcinDemuxContext *idcin = s->priv_data; + + if (idcin->first_pkt_pos > 0) { + int ret = avio_seek(s->pb, idcin->first_pkt_pos, SEEK_SET); + if (ret < 0) + return ret; + ff_update_cur_dts(s, s->streams[idcin->video_stream_index], 0); + idcin->next_chunk_is_video = 1; + idcin->current_audio_chunk = 0; + return 0; + } + return -1; +} + AVInputFormat ff_idcin_demuxer = { .name = "idcin", .long_name = NULL_IF_CONFIG_SMALL("id Cinematic"), @@ -322,4 +341,6 @@ AVInputFormat ff_idcin_demuxer = { .read_probe = idcin_probe, .read_header = idcin_read_header, .read_packet = idcin_read_packet, + .read_seek = idcin_read_seek, + .flags = AVFMT_NO_BYTE_SEEK, };