mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-02 16:52:42 +00:00
Code Issues 1 Projects Releases Wiki Activity

_peer_get_caps() -> peer_query_caps()

Browse source
This commit is contained in:
Wim Taymans 2011-11-15 17:11:46 +01:00
parent d805f0f034
commit c55962c2d3
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst/gstpad.c
View file

@ -2157,7 +2157,7 @@ gst_pad_query_caps (GstPad * pad, GstCaps * filter)
/** /**
* gst_pad_peer_get_caps: * gst_pad_peer_query_caps:
* @pad: a #GstPad to get the capabilities of. * @pad: a #GstPad to get the capabilities of.
* @filter: a #GstCaps filter. * @filter: a #GstCaps filter.
* *
@ -2174,7 +2174,7 @@ gst_pad_query_caps (GstPad * pad, GstCaps * filter)
* returns %NULL when there is no peer pad. * returns %NULL when there is no peer pad.
*/ */
GstCaps * GstCaps *
gst_pad_peer_get_caps (GstPad * pad, GstCaps * filter) gst_pad_peer_query_caps (GstPad * pad, GstCaps * filter)
{ {
GstCaps *result = NULL; GstCaps *result = NULL;
GstQuery *query; GstQuery *query;

2
gst/gstpad.h
View file

@ -838,7 +838,7 @@ GstCaps * gst_pad_query_caps (GstPad * pad, GstCaps *filter);
gboolean gst_pad_accept_caps (GstPad * pad, GstCaps *caps); gboolean gst_pad_accept_caps (GstPad * pad, GstCaps *caps);
gboolean gst_pad_set_caps (GstPad * pad, GstCaps *caps); gboolean gst_pad_set_caps (GstPad * pad, GstCaps *caps);
GstCaps * gst_pad_peer_get_caps (GstPad * pad, GstCaps *filter); GstCaps * gst_pad_peer_query_caps (GstPad * pad, GstCaps *filter);
gboolean gst_pad_peer_accept_caps (GstPad * pad, GstCaps *caps); gboolean gst_pad_peer_accept_caps (GstPad * pad, GstCaps *caps);
/* capsnego for linked pads */ /* capsnego for linked pads */

2
libs/gst/base/gstbasesrc.c
View file

@ -2760,7 +2760,7 @@ gst_base_src_default_negotiate (GstBaseSrc * basesrc)
goto no_caps; goto no_caps;
/* get the peer caps */ /* get the peer caps */
peercaps = gst_pad_peer_get_caps (GST_BASE_SRC_PAD (basesrc), thiscaps); peercaps = gst_pad_peer_query_caps (GST_BASE_SRC_PAD (basesrc), thiscaps);
GST_DEBUG_OBJECT (basesrc, "caps of peer: %" GST_PTR_FORMAT, peercaps); GST_DEBUG_OBJECT (basesrc, "caps of peer: %" GST_PTR_FORMAT, peercaps);
if (peercaps) { if (peercaps) {
/* The result is already a subset of our caps */ /* The result is already a subset of our caps */

2
libs/gst/base/gstbasetransform.c
View file

@ -673,7 +673,7 @@ gst_base_transform_query_caps (GstBaseTransform * trans, GstPad * pad,
peerfilter = temp; peerfilter = temp;
} }
peercaps = gst_pad_peer_get_caps (otherpad, peerfilter); peercaps = gst_pad_peer_query_caps (otherpad, peerfilter);
if (peerfilter) if (peerfilter)
gst_caps_unref (peerfilter); gst_caps_unref (peerfilter);

6
tests/check/elements/selector.c
View file

@ -474,7 +474,7 @@ GST_START_TEST (test_output_selector_getcaps_none);
g_object_set (sel, "active-pad", pad, NULL); g_object_set (sel, "active-pad", pad, NULL);
caps = gst_pad_peer_get_caps (input_pad, NULL); caps = gst_pad_peer_query_caps (input_pad, NULL);
/* in 'none' mode, the getcaps returns the template, which is ANY */ /* in 'none' mode, the getcaps returns the template, which is ANY */
g_assert (gst_caps_is_any (caps)); g_assert (gst_caps_is_any (caps));
@ -514,7 +514,7 @@ GST_START_TEST (test_output_selector_getcaps_all);
g_object_set (sel, "active-pad", pad, NULL); g_object_set (sel, "active-pad", pad, NULL);
caps = gst_pad_peer_get_caps (input_pad, NULL); caps = gst_pad_peer_query_caps (input_pad, NULL);
g_assert (gst_caps_is_equal (caps, expected)); g_assert (gst_caps_is_equal (caps, expected));
gst_caps_unref (caps); gst_caps_unref (caps);
@ -556,7 +556,7 @@ GST_START_TEST (test_output_selector_getcaps_active);
templ = gst_pad_get_pad_template ((GstPad *) walker->data); templ = gst_pad_get_pad_template ((GstPad *) walker->data);
expected = gst_pad_template_get_caps (templ); expected = gst_pad_template_get_caps (templ);
caps = gst_pad_peer_get_caps (input_pad, NULL); caps = gst_pad_peer_query_caps (input_pad, NULL);
g_assert (gst_caps_is_equal (caps, expected)); g_assert (gst_caps_is_equal (caps, expected));
gst_caps_unref (caps); gst_caps_unref (caps);