mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

mpegtsdemux: Remember seek sequence number

Browse source 
* 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).
This commit is contained in:
Edward Hervey 2013-07-15 11:15:11 +02:00
parent 024aa47f64
commit 1b1b3a40d7
3 changed files with 24 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
gst/mpegtsdemux/mpegtsbase.c
View file

@ -199,6 +199,7 @@ mpegts_base_reset (MpegTSBase * base)
/* pmt pids will be added and removed dynamically */ /* pmt pids will be added and removed dynamically */
gst_segment_init (&base->segment, GST_FORMAT_UNDEFINED); gst_segment_init (&base->segment, GST_FORMAT_UNDEFINED);
base->last_seek_seqnum = (guint32) - 1;
base->mode = BASE_MODE_STREAMING; base->mode = BASE_MODE_STREAMING;
base->seen_pat = FALSE; base->seen_pat = FALSE;
@ -1335,6 +1336,11 @@ mpegts_base_handle_seek_event (MpegTSBase * base, GstPad * pad,
if (format != GST_FORMAT_TIME) if (format != GST_FORMAT_TIME)
return FALSE; 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) { if (base->mode == BASE_MODE_PUSHING) {
/* First try if upstream supports seeking in TIME format */ /* First try if upstream supports seeking in TIME format */
if (gst_pad_push_event (base->sinkpad, gst_event_ref (event))) { 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_SET, base->seek_offset,
GST_SEEK_TYPE_NONE, -1))) GST_SEEK_TYPE_NONE, -1)))
ret = GST_FLOW_ERROR; ret = GST_FLOW_ERROR;
else
base->last_seek_seqnum = GST_EVENT_SEQNUM (event);
base->mode = BASE_MODE_PUSHING; base->mode = BASE_MODE_PUSHING;
} }
} }
@ -1396,17 +1404,17 @@ mpegts_base_handle_seek_event (MpegTSBase * base, GstPad * pad,
} }
if (format == GST_FORMAT_TIME) {
/* If the subclass can seek, do that */ /* If the subclass can seek, do that */
if (klass->seek) { if (klass->seek) {
ret = klass->seek (base, event); ret = klass->seek (base, event);
if (G_UNLIKELY (ret != GST_FLOW_OK)) { if (G_UNLIKELY (ret != GST_FLOW_OK))
GST_WARNING ("seeking failed %s", gst_flow_get_name (ret)); GST_WARNING ("seeking failed %s", gst_flow_get_name (ret));
} else
base->last_seek_seqnum = GST_EVENT_SEQNUM (event);
} else { } else {
/* FIXME : Check this before so we don't do seeks we can't handle ? */
GST_WARNING ("subclass has no seek implementation"); GST_WARNING ("subclass has no seek implementation");
} }
}
if (flush) { if (flush) {
/* if we sent a FLUSH_START, we now send a FLUSH_STOP */ /* if we sent a FLUSH_START, we now send a FLUSH_STOP */

3
gst/mpegtsdemux/mpegtsbase.h
View file

@ -149,6 +149,9 @@ struct _MpegTSBase {
/* Upstream segment */ /* Upstream segment */
GstSegment segment; GstSegment segment;
/* Last received seek event seqnum (default -1) */
guint last_seek_seqnum;
/* Whether to parse private section or not */ /* Whether to parse private section or not */
gboolean parse_private_sections; gboolean parse_private_sections;

4
gst/mpegtsdemux/tsdemux.c
View file

@ -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); demux->segment_event = gst_event_new_segment (&demux->segment);
GST_EVENT_SEQNUM (demux->segment_event) = base->last_seek_seqnum;
}
push_new_segment: push_new_segment:
if (demux->update_segment) { if (demux->update_segment) {