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

urisourcebin: Preserve seqnum on EOS events

Browse source 
When converting EOS to/from our custom fake EOS event,
preserve any seqnum on the original event.
This commit is contained in:
Jan Schmidt 2017-01-12 22:28:50 +11:00
parent 90e86b8638
commit 5076520502
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gst/playback/gsturisourcebin.c
View file

@ -1085,6 +1085,7 @@ demux_pad_events (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
{ {
GstEvent *event; GstEvent *event;
GstStructure *s; GstStructure *s;
guint32 seqnum = gst_event_get_seqnum (ev);
GST_LOG_OBJECT (urisrc, "EOS on pad %" GST_PTR_FORMAT, pad); GST_LOG_OBJECT (urisrc, "EOS on pad %" GST_PTR_FORMAT, pad);
@ -1104,6 +1105,7 @@ demux_pad_events (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
/* Actually feed a custom EOS event to avoid marking pads as EOSed */ /* Actually feed a custom EOS event to avoid marking pads as EOSed */
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_event_set_seqnum (event, seqnum);
gst_pad_send_event (child_info->output_slot->sinkpad, event); gst_pad_send_event (child_info->output_slot->sinkpad, event);
} }
break; break;
@ -1270,6 +1272,9 @@ source_pad_event_probe (GstPad * pad, GstPadProbeInfo * info,
slot = g_object_get_data (G_OBJECT (pad), "urisourcebin.slotinfo"); slot = g_object_get_data (G_OBJECT (pad), "urisourcebin.slotinfo");
if (slot) { if (slot) {
GstEvent *eos;
guint32 seqnum;
if (slot->linked_info) { if (slot->linked_info) {
/* Do not clear output slot yet. A new input was /* Do not clear output slot yet. A new input was
* connected. We should just drop this EOS */ * connected. We should just drop this EOS */
@ -1277,7 +1282,10 @@ source_pad_event_probe (GstPad * pad, GstPadProbeInfo * info,
return GST_PAD_PROBE_DROP; return GST_PAD_PROBE_DROP;
} }
gst_pad_push_event (slot->srcpad, gst_event_new_eos ()); seqnum = gst_event_get_seqnum (event);
eos = gst_event_new_eos ();
gst_event_set_seqnum (eos, seqnum);
gst_pad_push_event (slot->srcpad, eos);
free_output_slot_async (urisrc, slot); free_output_slot_async (urisrc, slot);
} }