From: Wim Taymans Date: Tue, 15 Nov 2011 15:55:27 +0000 (+0100) Subject: update for _get_caps() -> _query_caps() X-Git-Tag: RELEASE-0.11.1~246 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b2d508ac405fdb4a1f61bc91fb2ffc750737ad90;p=platform%2Fupstream%2Fgst-plugins-good.git update for _get_caps() -> _query_caps() --- diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c index 1f3ab5d..9ef858e 100644 --- a/ext/jpeg/gstjpegdec.c +++ b/ext/jpeg/gstjpegdec.c @@ -743,7 +743,7 @@ gst_jpeg_dec_getcaps (GstPad * pad, GstCaps * filter) GstStructure *s; guint i, n; - peer_caps = gst_pad_get_caps (peer, filter); + peer_caps = gst_pad_query_caps (peer, filter); /* Translate peercaps to image/jpeg */ peer_caps = gst_caps_make_writable (peer_caps); diff --git a/ext/pulse/pulseaudiosink.c b/ext/pulse/pulseaudiosink.c index cf7214b..aafb7e4 100644 --- a/ext/pulse/pulseaudiosink.c +++ b/ext/pulse/pulseaudiosink.c @@ -645,7 +645,7 @@ proxypad_blocked_cb (GstPad * pad, GstPadProbeInfo * info, gpointer data) caps = gst_pad_get_current_caps (pbin->sinkpad); } else { /* 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)) { @@ -811,7 +811,7 @@ gst_pulse_audio_sink_sink_acceptcaps (GstPulseAudioSink * pbin, GstPad * pad, GstCaps *pad_caps = NULL; 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)) goto out; diff --git a/ext/pulse/pulsesink.c b/ext/pulse/pulsesink.c index 7500196..61da442 100644 --- a/ext/pulse/pulsesink.c +++ b/ext/pulse/pulsesink.c @@ -2028,7 +2028,7 @@ gst_pulsesink_query_acceptcaps (GstPulseSink * psink, GstCaps * caps) pa_format_info *format = NULL, *formats[1]; guint channels; - pad_caps = gst_pad_get_caps (pad, caps); + pad_caps = gst_pad_query_caps (pad, caps); ret = pad_caps != NULL; gst_caps_unref (pad_caps); diff --git a/ext/pulse/pulsesrc.c b/ext/pulse/pulsesrc.c index 26b54df..b92f902 100644 --- a/ext/pulse/pulsesrc.c +++ b/ext/pulse/pulsesrc.c @@ -926,7 +926,7 @@ gst_pulsesrc_negotiate (GstBaseSrc * basesrc) gboolean result = FALSE; /* 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); /* nothing or anything is allowed, we're done */ if (thiscaps == NULL || gst_caps_is_any (thiscaps)) diff --git a/gst/autodetect/gstautoaudiosink.c b/gst/autodetect/gstautoaudiosink.c index 19cbca6..65f7973 100644 --- a/gst/autodetect/gstautoaudiosink.c +++ b/gst/autodetect/gstautoaudiosink.c @@ -261,7 +261,7 @@ gst_auto_audio_sink_find_best (GstAutoAudioSink * sink) * accept only sinks that match with the filter caps */ if (sink->filter_caps) { 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_DEBUG_OBJECT (sink, "Checking caps: %" GST_PTR_FORMAT " vs. %" GST_PTR_FORMAT, diff --git a/gst/autodetect/gstautoaudiosrc.c b/gst/autodetect/gstautoaudiosrc.c index b46a88c..92eca00 100644 --- a/gst/autodetect/gstautoaudiosrc.c +++ b/gst/autodetect/gstautoaudiosrc.c @@ -264,7 +264,7 @@ gst_auto_audio_src_find_best (GstAutoAudioSrc * src) * accept only sources that match with the filter caps */ if (src->filter_caps) { 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_DEBUG_OBJECT (src, "Checking caps: %" GST_PTR_FORMAT " vs. %" GST_PTR_FORMAT, diff --git a/gst/autodetect/gstautovideosink.c b/gst/autodetect/gstautovideosink.c index e5cfafe..df01dda 100644 --- a/gst/autodetect/gstautovideosink.c +++ b/gst/autodetect/gstautovideosink.c @@ -257,7 +257,7 @@ gst_auto_video_sink_find_best (GstAutoVideoSink * sink) * accept only sinks that match with the filter caps */ if (sink->filter_caps) { 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_DEBUG_OBJECT (sink, "Checking caps: %" GST_PTR_FORMAT " vs. %" GST_PTR_FORMAT, diff --git a/gst/autodetect/gstautovideosrc.c b/gst/autodetect/gstautovideosrc.c index 202e887..626740d 100644 --- a/gst/autodetect/gstautovideosrc.c +++ b/gst/autodetect/gstautovideosrc.c @@ -260,7 +260,7 @@ gst_auto_video_src_find_best (GstAutoVideoSrc * src) * accept only sources that match with the filter caps */ if (src->filter_caps) { 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_DEBUG_OBJECT (src, "Checking caps: %" GST_PTR_FORMAT " vs. %" GST_PTR_FORMAT, diff --git a/gst/videocrop/gstaspectratiocrop.c b/gst/videocrop/gstaspectratiocrop.c index 475af6d..d2e5c59 100644 --- a/gst/videocrop/gstaspectratiocrop.c +++ b/gst/videocrop/gstaspectratiocrop.c @@ -398,7 +398,7 @@ gst_aspect_ratio_crop_get_caps (GstPad * pad, GstCaps * filter) } else { GstCaps *peer_caps; - peer_caps = gst_pad_get_caps (peer, filter); + peer_caps = gst_pad_query_caps (peer, filter); return_caps = gst_aspect_ratio_crop_transform_caps (aspect_ratio_crop, peer_caps); gst_caps_unref (peer_caps); diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c index 6f13b28..5912ff5 100644 --- a/sys/v4l2/gstv4l2src.c +++ b/sys/v4l2/gstv4l2src.c @@ -318,7 +318,7 @@ gst_v4l2src_negotiate (GstBaseSrc * basesrc) gboolean result = FALSE; /* 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); LOG_CAPS (basesrc, thiscaps); diff --git a/tests/icles/gdkpixbufsink-test.c b/tests/icles/gdkpixbufsink-test.c index a700a4a..c334326 100644 --- a/tests/icles/gdkpixbufsink-test.c +++ b/tests/icles/gdkpixbufsink-test.c @@ -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 * 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); s = gst_caps_get_structure (caps, 0);