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

urisourcebin: Clear EOS state with stream-start/flush-stop event

Browse source 
The EOS state marker should cleared on stream-start or flush-stop

https://bugzilla.gnome.org/show_bug.cgi?id=777009
This commit is contained in:
Seungha Yang 2017-01-08 21:53:27 +09:00 committed by Jan Schmidt
parent c10e7c5011
commit 87f21a925c
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gst/playback/gsturisourcebin.c
View file

@ -934,8 +934,8 @@ new_demuxer_pad_added_cb (GstElement * element, GstPad * pad,
gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM, gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_BLOCK_DOWNSTREAM,
pending_pad_blocked, urisrc, NULL); pending_pad_blocked, urisrc, NULL);
info->event_probe_id = info->event_probe_id =
gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM, gst_pad_add_probe (pad, GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM |
demux_pad_events, urisrc, NULL); GST_PAD_PROBE_TYPE_EVENT_FLUSH, demux_pad_events, urisrc, NULL);
} }
static GstPadProbeReturn static GstPadProbeReturn
@ -1066,6 +1066,7 @@ demux_pad_events (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
GstURISourceBin *urisrc = GST_URI_SOURCE_BIN (user_data); GstURISourceBin *urisrc = GST_URI_SOURCE_BIN (user_data);
ChildSrcPadInfo *child_info; ChildSrcPadInfo *child_info;
GstPadProbeReturn ret = GST_PAD_PROBE_OK; GstPadProbeReturn ret = GST_PAD_PROBE_OK;
GstEvent *ev = GST_PAD_PROBE_INFO_EVENT (info);
if (!(child_info = if (!(child_info =
g_object_get_data (G_OBJECT (pad), "urisourcebin.srcpadinfo"))) g_object_get_data (G_OBJECT (pad), "urisourcebin.srcpadinfo")))
@ -1078,9 +1079,9 @@ demux_pad_events (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
goto done; goto done;
} }
if (GST_IS_EVENT (GST_PAD_PROBE_INFO_DATA (info))) { switch (GST_EVENT_TYPE (ev)) {
GstEvent *ev = GST_PAD_PROBE_INFO_EVENT (info); case GST_EVENT_EOS:
if (GST_EVENT_TYPE (ev) == GST_EVENT_EOS) { {
GstEvent *event; GstEvent *event;
GstStructure *s; GstStructure *s;
@ -1102,12 +1103,23 @@ demux_pad_events (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
s = gst_structure_new_empty ("urisourcebin-custom-eos"); s = gst_structure_new_empty ("urisourcebin-custom-eos");
event = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM, s); event = gst_event_new_custom (GST_EVENT_CUSTOM_DOWNSTREAM, s);
gst_pad_send_event (child_info->output_slot->sinkpad, event); gst_pad_send_event (child_info->output_slot->sinkpad, event);
} else if (GST_EVENT_TYPE (ev) == GST_EVENT_CAPS) { }
break;
case GST_EVENT_CAPS:
{
GstCaps *caps; GstCaps *caps;
gst_event_parse_caps (ev, &caps); gst_event_parse_caps (ev, &caps);
gst_caps_replace (&child_info->cur_caps, caps); gst_caps_replace (&child_info->cur_caps, caps);
} }
break;
case GST_EVENT_STREAM_START:
case GST_EVENT_FLUSH_STOP:
child_info->output_slot->is_eos = FALSE;
break;
default:
break;
} }
GST_URI_SOURCE_BIN_UNLOCK (urisrc); GST_URI_SOURCE_BIN_UNLOCK (urisrc);
done: done: