update for _get_caps() -> _query_caps()

This commit is contained in:
Wim Taymans 2011-11-15 16:55:27 +01:00
parent 75dc9634eb
commit b2d508ac40
11 changed files with 12 additions and 12 deletions

View file

@ -743,7 +743,7 @@ gst_jpeg_dec_getcaps (GstPad * pad, GstCaps * filter)
GstStructure *s; GstStructure *s;
guint i, n; guint i, n;
peer_caps = gst_pad_get_caps (peer, filter); peer_caps = gst_pad_query_caps (peer, filter);
/* Translate peercaps to image/jpeg */ /* Translate peercaps to image/jpeg */
peer_caps = gst_caps_make_writable (peer_caps); peer_caps = gst_caps_make_writable (peer_caps);

View file

@ -645,7 +645,7 @@ proxypad_blocked_cb (GstPad * pad, GstPadProbeInfo * info, gpointer data)
caps = gst_pad_get_current_caps (pbin->sinkpad); caps = gst_pad_get_current_caps (pbin->sinkpad);
} else { } else {
/* We haven't, so get caps from upstream */ /* We haven't, so get caps from upstream */
caps = gst_pad_get_caps (pad, NULL); caps = gst_pad_query_caps (pad, NULL);
} }
if (gst_pad_accept_caps (sinkpad, caps)) { if (gst_pad_accept_caps (sinkpad, caps)) {
@ -811,7 +811,7 @@ gst_pulse_audio_sink_sink_acceptcaps (GstPulseAudioSink * pbin, GstPad * pad,
GstCaps *pad_caps = NULL; GstCaps *pad_caps = NULL;
gboolean ret = FALSE; gboolean ret = FALSE;
pad_caps = gst_pad_get_caps (pad, caps); pad_caps = gst_pad_query_caps (pad, caps);
if (!pad_caps || gst_caps_is_empty (pad_caps)) if (!pad_caps || gst_caps_is_empty (pad_caps))
goto out; goto out;

View file

@ -2028,7 +2028,7 @@ gst_pulsesink_query_acceptcaps (GstPulseSink * psink, GstCaps * caps)
pa_format_info *format = NULL, *formats[1]; pa_format_info *format = NULL, *formats[1];
guint channels; guint channels;
pad_caps = gst_pad_get_caps (pad, caps); pad_caps = gst_pad_query_caps (pad, caps);
ret = pad_caps != NULL; ret = pad_caps != NULL;
gst_caps_unref (pad_caps); gst_caps_unref (pad_caps);

View file

@ -926,7 +926,7 @@ gst_pulsesrc_negotiate (GstBaseSrc * basesrc)
gboolean result = FALSE; gboolean result = FALSE;
/* first see what is possible on our source pad */ /* first see what is possible on our source pad */
thiscaps = gst_pad_get_caps (GST_BASE_SRC_PAD (basesrc), NULL); thiscaps = gst_pad_query_caps (GST_BASE_SRC_PAD (basesrc), NULL);
GST_DEBUG_OBJECT (basesrc, "caps of src: %" GST_PTR_FORMAT, thiscaps); GST_DEBUG_OBJECT (basesrc, "caps of src: %" GST_PTR_FORMAT, thiscaps);
/* nothing or anything is allowed, we're done */ /* nothing or anything is allowed, we're done */
if (thiscaps == NULL || gst_caps_is_any (thiscaps)) if (thiscaps == NULL || gst_caps_is_any (thiscaps))

View file

@ -261,7 +261,7 @@ gst_auto_audio_sink_find_best (GstAutoAudioSink * sink)
* accept only sinks that match with the filter caps */ * accept only sinks that match with the filter caps */
if (sink->filter_caps) { if (sink->filter_caps) {
el_pad = gst_element_get_static_pad (GST_ELEMENT (el), "sink"); el_pad = gst_element_get_static_pad (GST_ELEMENT (el), "sink");
el_caps = gst_pad_get_caps (el_pad, NULL); el_caps = gst_pad_query_caps (el_pad, NULL);
gst_object_unref (el_pad); gst_object_unref (el_pad);
GST_DEBUG_OBJECT (sink, GST_DEBUG_OBJECT (sink,
"Checking caps: %" GST_PTR_FORMAT " vs. %" GST_PTR_FORMAT, "Checking caps: %" GST_PTR_FORMAT " vs. %" GST_PTR_FORMAT,

View file

@ -264,7 +264,7 @@ gst_auto_audio_src_find_best (GstAutoAudioSrc * src)
* accept only sources that match with the filter caps */ * accept only sources that match with the filter caps */
if (src->filter_caps) { if (src->filter_caps) {
el_pad = gst_element_get_static_pad (GST_ELEMENT (el), "src"); el_pad = gst_element_get_static_pad (GST_ELEMENT (el), "src");
el_caps = gst_pad_get_caps (el_pad, NULL); el_caps = gst_pad_query_caps (el_pad, NULL);
gst_object_unref (el_pad); gst_object_unref (el_pad);
GST_DEBUG_OBJECT (src, GST_DEBUG_OBJECT (src,
"Checking caps: %" GST_PTR_FORMAT " vs. %" GST_PTR_FORMAT, "Checking caps: %" GST_PTR_FORMAT " vs. %" GST_PTR_FORMAT,

View file

@ -257,7 +257,7 @@ gst_auto_video_sink_find_best (GstAutoVideoSink * sink)
* accept only sinks that match with the filter caps */ * accept only sinks that match with the filter caps */
if (sink->filter_caps) { if (sink->filter_caps) {
el_pad = gst_element_get_static_pad (GST_ELEMENT (el), "sink"); el_pad = gst_element_get_static_pad (GST_ELEMENT (el), "sink");
el_caps = gst_pad_get_caps (el_pad, NULL); el_caps = gst_pad_query_caps (el_pad, NULL);
gst_object_unref (el_pad); gst_object_unref (el_pad);
GST_DEBUG_OBJECT (sink, GST_DEBUG_OBJECT (sink,
"Checking caps: %" GST_PTR_FORMAT " vs. %" GST_PTR_FORMAT, "Checking caps: %" GST_PTR_FORMAT " vs. %" GST_PTR_FORMAT,

View file

@ -260,7 +260,7 @@ gst_auto_video_src_find_best (GstAutoVideoSrc * src)
* accept only sources that match with the filter caps */ * accept only sources that match with the filter caps */
if (src->filter_caps) { if (src->filter_caps) {
el_pad = gst_element_get_static_pad (GST_ELEMENT (el), "src"); el_pad = gst_element_get_static_pad (GST_ELEMENT (el), "src");
el_caps = gst_pad_get_caps (el_pad, NULL); el_caps = gst_pad_query_caps (el_pad, NULL);
gst_object_unref (el_pad); gst_object_unref (el_pad);
GST_DEBUG_OBJECT (src, GST_DEBUG_OBJECT (src,
"Checking caps: %" GST_PTR_FORMAT " vs. %" GST_PTR_FORMAT, "Checking caps: %" GST_PTR_FORMAT " vs. %" GST_PTR_FORMAT,

View file

@ -398,7 +398,7 @@ gst_aspect_ratio_crop_get_caps (GstPad * pad, GstCaps * filter)
} else { } else {
GstCaps *peer_caps; GstCaps *peer_caps;
peer_caps = gst_pad_get_caps (peer, filter); peer_caps = gst_pad_query_caps (peer, filter);
return_caps = return_caps =
gst_aspect_ratio_crop_transform_caps (aspect_ratio_crop, peer_caps); gst_aspect_ratio_crop_transform_caps (aspect_ratio_crop, peer_caps);
gst_caps_unref (peer_caps); gst_caps_unref (peer_caps);

View file

@ -318,7 +318,7 @@ gst_v4l2src_negotiate (GstBaseSrc * basesrc)
gboolean result = FALSE; gboolean result = FALSE;
/* first see what is possible on our source pad */ /* first see what is possible on our source pad */
thiscaps = gst_pad_get_caps (GST_BASE_SRC_PAD (basesrc), NULL); thiscaps = gst_pad_query_caps (GST_BASE_SRC_PAD (basesrc), NULL);
GST_DEBUG_OBJECT (basesrc, "caps of src: %" GST_PTR_FORMAT, thiscaps); GST_DEBUG_OBJECT (basesrc, "caps of src: %" GST_PTR_FORMAT, thiscaps);
LOG_CAPS (basesrc, thiscaps); LOG_CAPS (basesrc, thiscaps);

View file

@ -72,7 +72,7 @@ new_decoded_pad (GstElement * dec, GstPad * new_pad, gboolean last,
/* FIXME: is this racy or does decodebin2 make sure caps are always /* FIXME: is this racy or does decodebin2 make sure caps are always
* negotiated at this point? */ * negotiated at this point? */
caps = gst_pad_get_caps (new_pad, NULL); caps = gst_pad_query_caps (new_pad, NULL);
g_return_if_fail (caps != NULL); g_return_if_fail (caps != NULL);
s = gst_caps_get_structure (caps, 0); s = gst_caps_get_structure (caps, 0);