mpegtsdemux: Remember seek sequence number

* Avoids handling twice the same seek (can happen with playbin and files
  with subtitles)
* Set the sequence number of the segment event to the sequence number of
  the seek event that generated it (-1 for the initial one).

3 files changed, 24 insertions, 11 deletions

diff --git a/gst/mpegtsdemux/mpegtsbase.c b/gst/mpegtsdemux/mpegtsbase.c
index e09b4abe8..3344fb04f 100644
--- a/gst/mpegtsdemux/mpegtsbase.c
+++ b/gst/mpegtsdemux/mpegtsbase.c
@@ -199,6 +199,7 @@ mpegts_base_reset (MpegTSBase * base)
   /* pmt pids will be added and removed dynamically */
 
   gst_segment_init (&base->segment, GST_FORMAT_UNDEFINED);
+  base->last_seek_seqnum = (guint32) - 1;
 
   base->mode = BASE_MODE_STREAMING;
   base->seen_pat = FALSE;
@@ -1335,6 +1336,11 @@ mpegts_base_handle_seek_event (MpegTSBase * base, GstPad * pad,
   if (format != GST_FORMAT_TIME)
     return FALSE;
 
+  if (GST_EVENT_SEQNUM (event) == base->last_seek_seqnum) {
+    GST_DEBUG_OBJECT (base, "Skipping already handled seek");
+    return TRUE;
+  }
+
   if (base->mode == BASE_MODE_PUSHING) {
     /* First try if upstream supports seeking in TIME format */
     if (gst_pad_push_event (base->sinkpad, gst_event_ref (event))) {
@@ -1354,6 +1360,8 @@ mpegts_base_handle_seek_event (MpegTSBase * base, GstPad * pad,
                     GST_SEEK_TYPE_SET, base->seek_offset,
                     GST_SEEK_TYPE_NONE, -1)))
           ret = GST_FLOW_ERROR;
+        else
+          base->last_seek_seqnum = GST_EVENT_SEQNUM (event);
         base->mode = BASE_MODE_PUSHING;
       }
     }
@@ -1396,16 +1404,16 @@ mpegts_base_handle_seek_event (MpegTSBase * base, GstPad * pad,
   }
 
 
-  if (format == GST_FORMAT_TIME) {
-    /* If the subclass can seek, do that */
-    if (klass->seek) {
-      ret = klass->seek (base, event);
-      if (G_UNLIKELY (ret != GST_FLOW_OK)) {
-        GST_WARNING ("seeking failed %s", gst_flow_get_name (ret));
-      }
-    } else {
-      GST_WARNING ("subclass has no seek implementation");
-    }
+  /* If the subclass can seek, do that */
+  if (klass->seek) {
+    ret = klass->seek (base, event);
+    if (G_UNLIKELY (ret != GST_FLOW_OK))
+      GST_WARNING ("seeking failed %s", gst_flow_get_name (ret));
+    else
+      base->last_seek_seqnum = GST_EVENT_SEQNUM (event);
+  } else {
+    /* FIXME : Check this before so we don't do seeks we can't handle ? */
+    GST_WARNING ("subclass has no seek implementation");
   }
 
   if (flush) {
diff --git a/gst/mpegtsdemux/mpegtsbase.h b/gst/mpegtsdemux/mpegtsbase.h
index 81099da25..4ed8ba11b 100644
--- a/gst/mpegtsdemux/mpegtsbase.h
+++ b/gst/mpegtsdemux/mpegtsbase.h
@@ -149,6 +149,9 @@ struct _MpegTSBase {
   /* Upstream segment */
   GstSegment segment;
 
+  /* Last received seek event seqnum (default -1) */
+  guint last_seek_seqnum;
+
   /* Whether to parse private section or not */
   gboolean parse_private_sections;
 
diff --git a/gst/mpegtsdemux/tsdemux.c b/gst/mpegtsdemux/tsdemux.c
index a5cf2ec61..914967cc8 100644
--- a/gst/mpegtsdemux/tsdemux.c
+++ b/gst/mpegtsdemux/tsdemux.c
@@ -1400,8 +1400,10 @@ calculate_and_push_newsegment (GstTSDemux * demux, TSDemuxStream * stream)
     }
   }
 
-  if (!demux->segment_event)
+  if (!demux->segment_event) {
     demux->segment_event = gst_event_new_segment (&demux->segment);
+    GST_EVENT_SEQNUM (demux->segment_event) = base->last_seek_seqnum;
+  }
 
 push_new_segment:
   if (demux->update_segment) {