From b02034dda1a82f4152145dda870356da1458bc3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 20 Jul 2012 14:25:43 +0200 Subject: [PATCH] matroskademux: We need an index and index entry for reverse playback Reverse playback does not work with index-less files yet. --- gst/matroska/matroska-demux.c | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/gst/matroska/matroska-demux.c b/gst/matroska/matroska-demux.c index 9e2ca98bd7..d570e67ef2 100644 --- a/gst/matroska/matroska-demux.c +++ b/gst/matroska/matroska-demux.c @@ -1979,14 +1979,6 @@ gst_matroska_demux_handle_seek_event (GstMatroskaDemux * demux, GST_DEBUG_OBJECT (demux, "New segment %" GST_SEGMENT_FORMAT, &seeksegment); - if (!update) { - /* only have to update some segment, - * but also still have to honour flush and so on */ - GST_DEBUG_OBJECT (demux, "... no update"); - /* bad goto, bad ... */ - goto next; - } - /* check sanity before we start flushing and all that */ snap_next = after && !before; if (seeksegment.rate < 0) @@ -2001,11 +1993,28 @@ gst_matroska_demux_handle_seek_event (GstMatroskaDemux * demux, GST_DEBUG_OBJECT (demux, "No matching seek entry in index"); GST_OBJECT_UNLOCK (demux); return FALSE; + } else if (rate < 0.0) { + /* FIXME: We should build an index during playback or when scanning + * that can be used here. The reverse playback code requires seek_index + * and seek_entry to be set! + */ + GST_DEBUG_OBJECT (demux, + "No matching seek entry in index, needed for reverse playback"); + GST_OBJECT_UNLOCK (demux); + return FALSE; } } GST_DEBUG_OBJECT (demux, "Seek position looks sane"); GST_OBJECT_UNLOCK (demux); + if (!update) { + /* only have to update some segment, + * but also still have to honour flush and so on */ + GST_DEBUG_OBJECT (demux, "... no update"); + /* bad goto, bad ... */ + goto next; + } + if (demux->streaming) { GST_OBJECT_LOCK (demux); /* now update the real segment info */