mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

dashdemux: make sure flushes have the same seqnum as the seek event

Browse source 
They are part of the same operation and should preserve the seqnum
This commit is contained in:
Thiago Santos 2014-11-07 19:16:47 -03:00
parent e60bdc553c
commit 39ba21619e
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ext/dash/gstdashdemux.c
View file

@ -477,6 +477,7 @@ gst_dash_demux_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
GSList *iter; GSList *iter;
gboolean update; gboolean update;
gboolean seek_to_eos = FALSE; gboolean seek_to_eos = FALSE;
guint32 seqnum;
GST_INFO_OBJECT (demux, "Received seek event"); GST_INFO_OBJECT (demux, "Received seek event");
@ -491,6 +492,8 @@ gst_dash_demux_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
if (format != GST_FORMAT_TIME) if (format != GST_FORMAT_TIME)
return FALSE; return FALSE;
seqnum = gst_event_get_seqnum (event);
GST_DEBUG_OBJECT (demux, GST_DEBUG_OBJECT (demux,
"seek event, rate: %f type: %d start: %" GST_TIME_FORMAT " stop: %" "seek event, rate: %f type: %d start: %" GST_TIME_FORMAT " stop: %"
GST_TIME_FORMAT, rate, start_type, GST_TIME_ARGS (start), GST_TIME_FORMAT, rate, start_type, GST_TIME_ARGS (start),
@ -505,12 +508,17 @@ gst_dash_demux_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
GST_DASH_DEMUX_CLIENT_LOCK (demux); GST_DASH_DEMUX_CLIENT_LOCK (demux);
if (flags & GST_SEEK_FLAG_FLUSH) { if (flags & GST_SEEK_FLAG_FLUSH) {
GstEvent *fstart = gst_event_new_flush_start ();
gst_event_set_seqnum (fstart, seqnum);
GST_DEBUG_OBJECT (demux, "sending flush start"); GST_DEBUG_OBJECT (demux, "sending flush start");
for (iter = demux->streams; iter; iter = g_slist_next (iter)) { for (iter = demux->streams; iter; iter = g_slist_next (iter)) {
GstDashDemuxStream *stream; GstDashDemuxStream *stream;
stream = iter->data; stream = iter->data;
gst_pad_push_event (stream->pad, gst_event_new_flush_start ()); gst_pad_push_event (stream->pad, gst_event_ref (fstart));
} }
gst_event_unref (fstart);
} }
gst_dash_demux_stop (demux); gst_dash_demux_stop (demux);
@ -576,6 +584,9 @@ gst_dash_demux_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
} }
if (flags & GST_SEEK_FLAG_FLUSH) { if (flags & GST_SEEK_FLAG_FLUSH) {
GstEvent *fstop = gst_event_new_flush_stop (TRUE);
gst_event_set_seqnum (fstop, seqnum);
GST_DEBUG_OBJECT (demux, "Sending flush stop on all pad"); GST_DEBUG_OBJECT (demux, "Sending flush stop on all pad");
for (iter = demux->streams; iter; iter = g_slist_next (iter)) { for (iter = demux->streams; iter; iter = g_slist_next (iter)) {
GstDashDemuxStream *stream; GstDashDemuxStream *stream;
@ -583,8 +594,9 @@ gst_dash_demux_src_event (GstPad * pad, GstObject * parent, GstEvent * event)
stream = iter->data; stream = iter->data;
stream->need_header = TRUE; stream->need_header = TRUE;
stream->stream_eos = seek_to_eos; stream->stream_eos = seek_to_eos;
gst_pad_push_event (stream->pad, gst_event_new_flush_stop (TRUE)); gst_pad_push_event (stream->pad, gst_event_ref (fstop));
} }
gst_event_unref (fstop);
} else if (seek_to_eos) { } else if (seek_to_eos) {
for (iter = demux->streams; iter; iter = g_slist_next (iter)) { for (iter = demux->streams; iter; iter = g_slist_next (iter)) {
GstDashDemuxStream *stream; GstDashDemuxStream *stream;