diff options
author | Thiago Santos <thiagoss@osg.samsung.com> | 2015-12-10 14:38:53 -0300 |
---|---|---|
committer | Thiago Santos <thiagoss@osg.samsung.com> | 2015-12-10 14:38:53 -0300 |
commit | 784fdb4ec292c2b9102e6875292deb88233ccd42 (patch) | |
tree | 54702eace4094e76fd2bd341104b0c34b83e7493 | |
parent | 9c2bcd7b768d77a79fe6e4b9b864ec60427d1bef (diff) |
uridecodebin: drop linking checks for source/queue/typefind/decodebinlink-checks
The 'same-parent' check is not needed here.
Queue, typefind and decodebin (at the beginning) are agnostic so
the caps checks aren't meaningful.
-rw-r--r-- | gst/playback/gsturidecodebin.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/gst/playback/gsturidecodebin.c b/gst/playback/gsturidecodebin.c index 2a4e7bca7..f4ec8d815 100644 --- a/gst/playback/gsturidecodebin.c +++ b/gst/playback/gsturidecodebin.c @@ -1575,7 +1575,7 @@ analyse_source (GstURIDecodeBin * decoder, gboolean * is_raw, gst_bin_add (GST_BIN_CAST (decoder), outelem); sinkpad = gst_element_get_static_pad (outelem, "sink"); - gst_pad_link (pad, sinkpad); + gst_pad_link_full (pad, sinkpad, GST_PAD_LINK_CHECK_NOTHING); gst_object_unref (sinkpad); /* save queue pointer so we can remove it later */ @@ -1980,7 +1980,8 @@ type_found (GstElement * typefind, guint probability, gst_bin_add (GST_BIN_CAST (decoder), queue); - if (!gst_element_link_pads (typefind, "src", queue, "sink")) + if (!gst_element_link_pads_full (typefind, "src", queue, "sink", + GST_PAD_LINK_CHECK_NOTHING)) goto could_not_link; src_elem = queue; } @@ -1990,7 +1991,8 @@ type_found (GstElement * typefind, guint probability, * the state change */ g_object_set (dec_elem, "sink-caps", caps, NULL); - if (!gst_element_link_pads (src_elem, "src", dec_elem, "sink")) + if (!gst_element_link_pads_full (src_elem, "src", dec_elem, "sink", + GST_PAD_LINK_CHECK_NOTHING)) goto could_not_link; /* PLAYING in one go might fail (see bug #632782) */ @@ -2036,7 +2038,8 @@ setup_streaming (GstURIDecodeBin * decoder) gst_bin_add (GST_BIN_CAST (decoder), typefind); - if (!gst_element_link_pads (decoder->source, NULL, typefind, "sink")) + if (!gst_element_link_pads_full (decoder->source, NULL, typefind, "sink", + GST_PAD_LINK_CHECK_NOTHING)) goto could_not_link; decoder->typefind = typefind; @@ -2149,7 +2152,8 @@ source_new_pad (GstElement * element, GstPad * pad, GstURIDecodeBin * bin) goto no_decodebin; /* and link to decoder */ - if (!gst_element_link_pads (bin->source, NULL, decoder, "sink")) + if (!gst_element_link_pads_full (bin->source, NULL, decoder, "sink", + GST_PAD_LINK_CHECK_NOTHING)) goto could_not_link; GST_DEBUG_OBJECT (bin, "linked decoder to new pad"); @@ -2282,7 +2286,8 @@ setup_source (GstURIDecodeBin * decoder) if (!dec_elem) goto no_decoder; - if (!gst_element_link_pads (decoder->source, NULL, dec_elem, "sink")) + if (!gst_element_link_pads_full (decoder->source, NULL, dec_elem, "sink", + GST_PAD_LINK_CHECK_NOTHING)) goto could_not_link; } } |