mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

qtdemux: Propagate stick events downstream when creating pads

Browse source 
If upstream provided a stream collection event before any pads were created,
make sure it's propagated downstream when pads are created.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1891>
This commit is contained in:
Edward Hervey 2019-07-10 17:21:01 +02:00 committed by GStreamer Marge Bot
parent a2c25ccd09
commit 568b918971
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
subprojects/gst-plugins-good/gst/isomp4/qtdemux.c
View file

@ -8814,6 +8814,7 @@ gst_qtdemux_configure_stream (GstQTDemux * qtdemux, QtDemuxStream * stream)
} }
if (stream->pad) { if (stream->pad) {
gboolean forward_collection = FALSE;
GstCaps *prev_caps = NULL; GstCaps *prev_caps = NULL;
GST_PAD_ELEMENT_PRIVATE (stream->pad) = stream; GST_PAD_ELEMENT_PRIVATE (stream->pad) = stream;
@ -8831,8 +8832,6 @@ gst_qtdemux_configure_stream (GstQTDemux * qtdemux, QtDemuxStream * stream)
} }
} }
GST_DEBUG_OBJECT (qtdemux, "setting caps %" GST_PTR_FORMAT,
CUR_STREAM (stream)->caps);
if (stream->new_stream) { if (stream->new_stream) {
GstEvent *event; GstEvent *event;
GstStreamFlags stream_flags = GST_STREAM_FLAG_NONE; GstStreamFlags stream_flags = GST_STREAM_FLAG_NONE;
@ -8865,6 +8864,8 @@ gst_qtdemux_configure_stream (GstQTDemux * qtdemux, QtDemuxStream * stream)
} }
gst_event_set_stream_flags (event, stream_flags); gst_event_set_stream_flags (event, stream_flags);
gst_pad_push_event (stream->pad, event); gst_pad_push_event (stream->pad, event);
forward_collection = TRUE;
} }
prev_caps = gst_pad_get_current_caps (stream->pad); prev_caps = gst_pad_get_current_caps (stream->pad);
@ -8885,6 +8886,14 @@ gst_qtdemux_configure_stream (GstQTDemux * qtdemux, QtDemuxStream * stream)
if (prev_caps) if (prev_caps)
gst_caps_unref (prev_caps); gst_caps_unref (prev_caps);
stream->new_caps = FALSE; stream->new_caps = FALSE;
if (forward_collection) {
/* Forward upstream collection and selection if any */
GstEvent *upstream_event = gst_pad_get_sticky_event (qtdemux->sinkpad,
GST_EVENT_STREAM_COLLECTION, 0);
if (upstream_event)
gst_pad_push_event (stream->pad, upstream_event);
}
} }
return TRUE; return TRUE;
} }