mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 22:36:33 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "gstpad: Return pad template in get_caps if pad is not negotiable"

Browse source 
This reverts commit 7460321a60.

crack
This commit is contained in:
Edward Hervey 2010-06-15 11:48:17 +02:00
parent 19334dbb85
commit 3df54c45bf
2 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst/gstpad.c
View file

@ -2181,14 +2181,6 @@ gst_pad_get_caps_unlocked (GstPad * pad)
GST_CAT_DEBUG_OBJECT (GST_CAT_CAPS, pad, "get pad caps");
/* If the parent element is in GST_STATE_NULL, return the template caps */
if (G_UNLIKELY (!GST_PAD_IS_NEGOTIABLE (pad) && GST_PAD_PAD_TEMPLATE (pad))) {
GST_CAT_DEBUG_OBJECT (GST_CAT_CAPS, pad,
"parent element is in GST_STATE_NULL, using pad templates");
result = gst_caps_ref (GST_PAD_TEMPLATE_CAPS (GST_PAD_PAD_TEMPLATE (pad)));
goto done;
}
if (GST_PAD_GETCAPSFUNC (pad)) {
GST_CAT_DEBUG_OBJECT (GST_CAT_CAPS, pad,
"dispatching to pad getcaps function");

6
tests/check/gst/gstghostpad.c
View file

@ -591,9 +591,6 @@ GST_START_TEST (test_ghost_pads_new_from_template)
/* check template is properly set */
fail_unless (GST_PAD_PAD_TEMPLATE (ghostpad) == ghosttempl);
/* Set pad negotiable so the getcaps call goes through */
gst_pad_set_negotiable (ghostpad, TRUE);
/* check ghostpad caps are from the sinkpad */
newcaps = gst_pad_get_caps (ghostpad);
fail_unless (newcaps != NULL);
@ -648,9 +645,6 @@ GST_START_TEST (test_ghost_pads_new_no_target_from_template)
fail_unless (gst_ghost_pad_set_target ((GstGhostPad *) ghostpad, sinkpad));
/* set pad negotiable so the getcaps call goes through */
gst_pad_set_negotiable (ghostpad, TRUE);
/* check ghostpad caps are now from the target pad */
newcaps = gst_pad_get_caps (ghostpad);
fail_unless (newcaps != NULL);