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

decodebin: Push caps event immediately to ghost pad to avoid exposing pads without caps

Browse source
This commit is contained in:
Alexander Schrab 2013-02-08 08:46:25 +01:00 committed by Sebastian Dröge
parent 31312d586e
commit e7caef6b29
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
gst/playback/gstdecodebin2.c
View file

@ -3890,8 +3890,13 @@ source_pad_blocked_cb (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
if (GST_PAD_PROBE_INFO_TYPE (info) & GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM) { if (GST_PAD_PROBE_INFO_TYPE (info) & GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM) {
GST_LOG_OBJECT (pad, "Seeing event '%s'", GST_LOG_OBJECT (pad, "Seeing event '%s'",
GST_EVENT_TYPE_NAME (GST_PAD_PROBE_INFO_EVENT (info))); GST_EVENT_TYPE_NAME (GST_PAD_PROBE_INFO_EVENT (info)));
if ((GST_EVENT_TYPE (GST_PAD_PROBE_INFO_EVENT (info)) != GST_EVENT_CAPS)
&& (GST_EVENT_IS_STICKY (GST_PAD_PROBE_INFO_EVENT (info)) if (GST_EVENT_TYPE (GST_PAD_PROBE_INFO_EVENT (info)) == GST_EVENT_CAPS) {
/* manually push event to ghost pad to avoid exposing pads
* that don't have the sticky caps event */
gst_pad_push_event (GST_PAD_CAST (dpad),
gst_event_ref (GST_PAD_PROBE_INFO_EVENT (info)));
} else if ((GST_EVENT_IS_STICKY (GST_PAD_PROBE_INFO_EVENT (info))
|| !GST_EVENT_IS_SERIALIZED (GST_PAD_PROBE_INFO_EVENT (info)))) { || !GST_EVENT_IS_SERIALIZED (GST_PAD_PROBE_INFO_EVENT (info)))) {
/* do not block on sticky or out of band events otherwise the allocation query /* do not block on sticky or out of band events otherwise the allocation query
from demuxer might block the loop thread */ from demuxer might block the loop thread */
@ -3913,11 +3918,6 @@ source_pad_blocked_cb (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
} }
EXPOSE_UNLOCK (dbin); EXPOSE_UNLOCK (dbin);
/* If we unblocked due to a caps event, let it go through */
if ((GST_PAD_PROBE_INFO_TYPE (info) & GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM) &&
(GST_EVENT_TYPE (GST_PAD_PROBE_INFO_EVENT (info)) == GST_EVENT_CAPS))
return GST_PAD_PROBE_PASS;
return GST_PAD_PROBE_OK; return GST_PAD_PROBE_OK;
} }