mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-07-02 20:55:55 +00:00
Code Issues 1 Projects Releases Wiki Activity

_accept_caps() -> _query_accept_caps()

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

7
docs/gst/gstreamer-sections.txt
View file

@ -1596,8 +1596,7 @@ gst_pad_get_pad_template_caps
gst_pad_set_caps
gst_pad_get_peer
gst_pad_peer_get_caps
gst_pad_peer_get_caps_reffed
gst_pad_peer_query_caps
gst_pad_use_fixed_caps
gst_pad_has_current_caps
@ -1639,12 +1638,12 @@ GstPadLinkFunction
gst_pad_set_unlink_function
GstPadUnlinkFunction
gst_pad_accept_caps
gst_pad_query_accept_caps
gst_pad_proxy_query_caps
gst_pad_proxy_query_accept_caps
gst_pad_peer_accept_caps
gst_pad_peer_query_accept_caps
gst_pad_set_activate_function
GstPadActivateFunction

8
gst/gstpad.c
View file

@ -2198,7 +2198,7 @@ gst_pad_peer_query_caps (GstPad * pad, GstCaps * filter)
}
/**
* gst_pad_accept_caps:
* gst_pad_query_accept_caps:
* @pad: a #GstPad to check
* @caps: a #GstCaps to check on the pad
*
@ -2207,7 +2207,7 @@ gst_pad_peer_query_caps (GstPad * pad, GstCaps * filter)
* Returns: TRUE if the pad can accept the caps.
*/
gboolean
gst_pad_accept_caps (GstPad * pad, GstCaps * caps)
gst_pad_query_accept_caps (GstPad * pad, GstCaps * caps)
{
gboolean res = TRUE;
GstQuery *query;
@ -2228,7 +2228,7 @@ gst_pad_accept_caps (GstPad * pad, GstCaps * caps)
}
/**
* gst_pad_peer_accept_caps:
* gst_pad_peer_query_accept_caps:
* @pad: a #GstPad to check the peer of
* @caps: a #GstCaps to check on the pad
*
@ -2238,7 +2238,7 @@ gst_pad_accept_caps (GstPad * pad, GstCaps * caps)
* Returns: TRUE if the peer of @pad can accept the caps or @pad has no peer.
*/
gboolean
gst_pad_peer_accept_caps (GstPad * pad, GstCaps * caps)
gst_pad_peer_query_accept_caps (GstPad * pad, GstCaps * caps)
{
gboolean res = TRUE;
GstQuery *query;

4
gst/gstpad.h
View file

@ -835,11 +835,11 @@ GstCaps* gst_pad_get_pad_template_caps (GstPad *pad);
GstCaps * gst_pad_get_current_caps (GstPad * pad);
gboolean gst_pad_has_current_caps (GstPad * pad);
GstCaps * gst_pad_query_caps (GstPad * pad, GstCaps *filter);
gboolean gst_pad_accept_caps (GstPad * pad, GstCaps *caps);
gboolean gst_pad_query_accept_caps (GstPad * pad, GstCaps *caps);
gboolean gst_pad_set_caps (GstPad * pad, GstCaps *caps);
GstCaps * gst_pad_peer_query_caps (GstPad * pad, GstCaps *filter);
gboolean gst_pad_peer_accept_caps (GstPad * pad, GstCaps *caps);
gboolean gst_pad_peer_query_accept_caps (GstPad * pad, GstCaps *caps);
/* capsnego for linked pads */
GstCaps * gst_pad_get_allowed_caps (GstPad * pad);

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

@ -1056,7 +1056,7 @@ gst_base_transform_find_transform (GstBaseTransform * trans, GstPad * pad,
goto could_not_fixate;
/* and peer should accept */
if (otherpeer && !gst_pad_accept_caps (otherpeer, othercaps))
if (otherpeer && !gst_pad_query_accept_caps (otherpeer, othercaps))
goto peer_no_accept;
GST_DEBUG_OBJECT (trans, "Input caps were %" GST_PTR_FORMAT

8
plugins/elements/gstcapsfilter.c
View file

@ -296,9 +296,13 @@ gst_capsfilter_accept_caps (GstBaseTransform * base,
if (ret) {
/* if we can intersect, see if the other end also accepts */
if (direction == GST_PAD_SRC)
ret = gst_pad_peer_accept_caps (GST_BASE_TRANSFORM_SINK_PAD (base), caps);
ret =
gst_pad_peer_query_accept_caps (GST_BASE_TRANSFORM_SINK_PAD (base),
caps);
else
ret = gst_pad_peer_accept_caps (GST_BASE_TRANSFORM_SRC_PAD (base), caps);
ret =
gst_pad_peer_query_accept_caps (GST_BASE_TRANSFORM_SRC_PAD (base),
caps);
GST_DEBUG_OBJECT (capsfilter, "peer accept: %d", ret);
}