[FFmpeg-cvslog] idcin: allow seeking back to the first packet

Justin Ruggles git at videolan.org
Thu Jan 10 12:50:11 CET 2013


ffmpeg | branch: master | Justin Ruggles <justin.ruggles at gmail.com> | Wed Aug  1 17:14:39 2012 -0400| [7040e479a1530b2eda4b89a182d5eb50a77bd907] | committer: Justin Ruggles

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.

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

 libavformat/idcin.c |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/libavformat/idcin.c b/libavformat/idcin.c
index 122fd8e..7a0042b 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,
 };



More information about the ffmpeg-cvslog mailing list