mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 10:41:04 +00:00
Code Issues 1 Projects Releases Wiki Activity

uridecodebin: Dont link random pads

Browse source 
When linking source pads to decodebin, make sure we use the *specified* new
source pad and not some random one.

This avoids ending up with source pads being unlinked.

Main cause of random timeouts with rtsp change_state_intensive validate tests

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/687>
This commit is contained in:
Edward Hervey 2020-06-03 11:29:09 +02:00 committed by GStreamer Merge Bot
parent 42dcbcd61f
commit b087415757
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/playback/gsturidecodebin.c
View file

@ -2148,6 +2148,7 @@ source_new_pad (GstElement * element, GstPad * pad, GstURIDecodeBin * bin)
GstElement *decoder; GstElement *decoder;
gboolean is_raw; gboolean is_raw;
GstCaps *rawcaps; GstCaps *rawcaps;
GstPad *sinkpad;
GST_URI_DECODE_BIN_LOCK (bin); GST_URI_DECODE_BIN_LOCK (bin);
GST_DEBUG_OBJECT (bin, "Found new pad %s.%s in source element %s", GST_DEBUG_OBJECT (bin, "Found new pad %s.%s in source element %s",
@ -2173,10 +2174,12 @@ source_new_pad (GstElement * element, GstPad * pad, GstURIDecodeBin * bin)
goto no_decodebin; goto no_decodebin;
/* and link to decoder */ /* and link to decoder */
if (!gst_element_link_pads (bin->source, NULL, decoder, "sink")) sinkpad = gst_element_get_static_pad (decoder, "sink");
if (gst_pad_link (pad, sinkpad) != GST_PAD_LINK_OK)
goto could_not_link; goto could_not_link;
gst_object_unref (sinkpad);
GST_DEBUG_OBJECT (bin, "linked decoder to new pad"); GST_DEBUG_OBJECT (bin, "linked decoder to new source pad");
gst_element_sync_state_with_parent (decoder); gst_element_sync_state_with_parent (decoder);
GST_URI_DECODE_BIN_UNLOCK (bin); GST_URI_DECODE_BIN_UNLOCK (bin);
@ -2192,6 +2195,7 @@ no_decodebin:
} }
could_not_link: could_not_link:
{ {
gst_object_unref (sinkpad);
GST_ELEMENT_ERROR (bin, CORE, NEGOTIATION, GST_ELEMENT_ERROR (bin, CORE, NEGOTIATION,
(NULL), ("Can't link source to decoder element")); (NULL), ("Can't link source to decoder element"));
GST_URI_DECODE_BIN_UNLOCK (bin); GST_URI_DECODE_BIN_UNLOCK (bin);