From 797523efbd4e0f4056b717dcd371309155ef576a Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Tue, 15 Nov 2011 17:29:45 +0100 Subject: [PATCH] _peer_get_caps() -> _peer_query_caps() --- ext/jpeg/gstjpegenc.c | 2 +- ext/pulse/pulseaudiosink.c | 2 +- ext/pulse/pulsesrc.c | 2 +- gst/goom/gstgoom.c | 2 +- gst/law/alaw-decode.c | 2 +- gst/law/alaw-encode.c | 2 +- gst/law/mulaw-decode.c | 2 +- gst/law/mulaw-encode.c | 2 +- gst/rtp/gstrtpg726pay.c | 2 +- gst/rtp/gstrtph263ppay.c | 4 ++-- gst/rtp/gstrtph264pay.c | 2 +- gst/rtpmanager/gstrtpjitterbuffer.c | 2 +- gst/shapewipe/gstshapewipe.c | 18 +++++++++--------- sys/v4l2/gstv4l2src.c | 2 +- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/ext/jpeg/gstjpegenc.c b/ext/jpeg/gstjpegenc.c index c25e3927a5..f622e4cbd9 100644 --- a/ext/jpeg/gstjpegenc.c +++ b/ext/jpeg/gstjpegenc.c @@ -305,7 +305,7 @@ gst_jpegenc_getcaps (GstPad * pad, GstCaps * filter) /* we want to proxy properties like width, height and framerate from the other end of the element */ - othercaps = gst_pad_peer_get_caps (jpegenc->srcpad, filter); + othercaps = gst_pad_peer_query_caps (jpegenc->srcpad, filter); if (othercaps == NULL || gst_caps_is_empty (othercaps) || gst_caps_is_any (othercaps)) { caps = gst_caps_copy (gst_pad_get_pad_template_caps (pad)); diff --git a/ext/pulse/pulseaudiosink.c b/ext/pulse/pulseaudiosink.c index aafb7e461f..d25da32734 100644 --- a/ext/pulse/pulseaudiosink.c +++ b/ext/pulse/pulseaudiosink.c @@ -606,7 +606,7 @@ out: static void update_eac3_alignment (GstPulseAudioSink * pbin) { - GstCaps *caps = gst_pad_peer_get_caps (pbin->sinkpad, NULL); + GstCaps *caps = gst_pad_peer_query_caps (pbin->sinkpad, NULL); GstStructure *st; if (!caps) diff --git a/ext/pulse/pulsesrc.c b/ext/pulse/pulsesrc.c index b92f902859..59dc96ede4 100644 --- a/ext/pulse/pulsesrc.c +++ b/ext/pulse/pulsesrc.c @@ -933,7 +933,7 @@ gst_pulsesrc_negotiate (GstBaseSrc * basesrc) goto no_nego_needed; /* get the peer caps */ - peercaps = gst_pad_peer_get_caps (GST_BASE_SRC_PAD (basesrc), NULL); + peercaps = gst_pad_peer_query_caps (GST_BASE_SRC_PAD (basesrc), NULL); GST_DEBUG_OBJECT (basesrc, "caps of peer: %" GST_PTR_FORMAT, peercaps); if (peercaps) { /* get intersection */ diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c index 3fc283c606..3df55a37dc 100644 --- a/gst/goom/gstgoom.c +++ b/gst/goom/gstgoom.c @@ -254,7 +254,7 @@ gst_goom_src_negotiate (GstGoom * goom) GST_DEBUG_OBJECT (goom, "performing negotiation"); /* see what the peer can do */ - othercaps = gst_pad_peer_get_caps (goom->srcpad, NULL); + othercaps = gst_pad_peer_query_caps (goom->srcpad, NULL); if (othercaps) { target = gst_caps_intersect (othercaps, templ); gst_caps_unref (othercaps); diff --git a/gst/law/alaw-decode.c b/gst/law/alaw-decode.c index 040f512605..7dbb3f9e0c 100644 --- a/gst/law/alaw-decode.c +++ b/gst/law/alaw-decode.c @@ -166,7 +166,7 @@ gst_alaw_dec_getcaps (GstPad * pad, GstCaps * filter) otherpad = alawdec->srcpad; } /* get caps from the peer, this can return NULL when there is no peer */ - othercaps = gst_pad_peer_get_caps (otherpad, filter); + othercaps = gst_pad_peer_query_caps (otherpad, filter); /* get the template caps to make sure we return something acceptable */ templ = gst_pad_get_pad_template_caps (pad); diff --git a/gst/law/alaw-encode.c b/gst/law/alaw-encode.c index 7767b11108..8fc4978925 100644 --- a/gst/law/alaw-encode.c +++ b/gst/law/alaw-encode.c @@ -318,7 +318,7 @@ gst_alaw_enc_getcaps (GstPad * pad, GstCaps * filter) otherpad = alawenc->srcpad; } /* get caps from the peer, this can return NULL when there is no peer */ - othercaps = gst_pad_peer_get_caps (otherpad, filter); + othercaps = gst_pad_peer_query_caps (otherpad, filter); /* get the template caps to make sure we return something acceptable */ templ = gst_pad_get_pad_template_caps (pad); diff --git a/gst/law/mulaw-decode.c b/gst/law/mulaw-decode.c index a50d8bf45d..e977c543ec 100644 --- a/gst/law/mulaw-decode.c +++ b/gst/law/mulaw-decode.c @@ -109,7 +109,7 @@ mulawdec_getcaps (GstPad * pad, GstCaps * filter) otherpad = mulawdec->srcpad; } /* get caps from the peer, this can return NULL when there is no peer */ - othercaps = gst_pad_peer_get_caps (otherpad, filter); + othercaps = gst_pad_peer_query_caps (otherpad, filter); /* get the template caps to make sure we return something acceptable */ templ = gst_pad_get_pad_template_caps (pad); diff --git a/gst/law/mulaw-encode.c b/gst/law/mulaw-encode.c index 7502197c82..83019db2e0 100644 --- a/gst/law/mulaw-encode.c +++ b/gst/law/mulaw-encode.c @@ -73,7 +73,7 @@ mulawenc_getcaps (GstPad * pad, GstCaps * filter) otherpad = mulawenc->srcpad; } /* get caps from the peer, this can return NULL when there is no peer */ - othercaps = gst_pad_peer_get_caps (otherpad, filter); + othercaps = gst_pad_peer_query_caps (otherpad, filter); /* get the template caps to make sure we return something acceptable */ templ = gst_pad_get_pad_template_caps (pad); diff --git a/gst/rtp/gstrtpg726pay.c b/gst/rtp/gstrtpg726pay.c index 480f0a7ee8..39393751aa 100644 --- a/gst/rtp/gstrtpg726pay.c +++ b/gst/rtp/gstrtpg726pay.c @@ -181,7 +181,7 @@ gst_rtp_g726_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps) GST_DEBUG_OBJECT (payload, "selected base encoding %s", encoding_name); /* now see if we need to produce AAL2 or not */ - peercaps = gst_pad_peer_get_caps (payload->srcpad, NULL); + peercaps = gst_pad_peer_query_caps (payload->srcpad, NULL); if (peercaps) { GstCaps *filter, *intersect; gchar *capsstr; diff --git a/gst/rtp/gstrtph263ppay.c b/gst/rtp/gstrtph263ppay.c index acc3fba940..50e2029bcf 100644 --- a/gst/rtp/gstrtph263ppay.c +++ b/gst/rtp/gstrtph263ppay.c @@ -182,7 +182,7 @@ gst_rtp_h263p_pay_setcaps (GstRTPBasePayload * payload, GstCaps * caps) g_return_val_if_fail (gst_caps_is_fixed (caps), FALSE); peercaps = - gst_pad_peer_get_caps (GST_RTP_BASE_PAYLOAD_SRCPAD (payload), NULL); + gst_pad_peer_query_caps (GST_RTP_BASE_PAYLOAD_SRCPAD (payload), NULL); if (peercaps) { GstCaps *intersect = gst_caps_intersect (peercaps, gst_pad_get_pad_template_caps (GST_RTP_BASE_PAYLOAD_SRCPAD (payload))); @@ -241,7 +241,7 @@ gst_rtp_h263p_pay_sink_getcaps (GstRTPBasePayload * payload, GstPad * pad, rtph263ppay = GST_RTP_H263P_PAY (payload); peercaps = - gst_pad_peer_get_caps (GST_RTP_BASE_PAYLOAD_SRCPAD (payload), filter); + gst_pad_peer_query_caps (GST_RTP_BASE_PAYLOAD_SRCPAD (payload), filter); if (!peercaps) return gst_caps_copy (gst_pad_get_pad_template_caps diff --git a/gst/rtp/gstrtph264pay.c b/gst/rtp/gstrtph264pay.c index fcb826b02e..9ad4624573 100644 --- a/gst/rtp/gstrtph264pay.c +++ b/gst/rtp/gstrtph264pay.c @@ -270,7 +270,7 @@ gst_rtp_h264_pay_getcaps (GstRTPBasePayload * payload, GstPad * pad, GstCaps *allowed_caps; allowed_caps = - gst_pad_peer_get_caps (GST_RTP_BASE_PAYLOAD_SRCPAD (payload), filter); + gst_pad_peer_query_caps (GST_RTP_BASE_PAYLOAD_SRCPAD (payload), filter); if (allowed_caps) { GstCaps *caps = NULL; diff --git a/gst/rtpmanager/gstrtpjitterbuffer.c b/gst/rtpmanager/gstrtpjitterbuffer.c index ffaa4db5af..e814f32f36 100644 --- a/gst/rtpmanager/gstrtpjitterbuffer.c +++ b/gst/rtpmanager/gstrtpjitterbuffer.c @@ -727,7 +727,7 @@ gst_rtp_jitter_buffer_getcaps (GstPad * pad, GstCaps * filter) other = (pad == priv->srcpad ? priv->sinkpad : priv->srcpad); - caps = gst_pad_peer_get_caps (other, filter); + caps = gst_pad_peer_query_caps (other, filter); templ = gst_pad_get_pad_template_caps (pad); if (caps == NULL) { diff --git a/gst/shapewipe/gstshapewipe.c b/gst/shapewipe/gstshapewipe.c index f344fabc5c..e3667a7fc7 100644 --- a/gst/shapewipe/gstshapewipe.c +++ b/gst/shapewipe/gstshapewipe.c @@ -330,7 +330,7 @@ gst_shape_wipe_video_sink_getcaps (GstPad * pad, GstCaps * filter) if (gst_pad_has_current_caps (pad)) return gst_pad_get_current_caps (pad); - tmp = gst_pad_peer_get_caps (self->srcpad, NULL); + tmp = gst_pad_peer_query_caps (self->srcpad, NULL); if (tmp) { ret = gst_caps_intersect (tmp, gst_pad_get_pad_template_caps (pad)); gst_caps_unref (tmp); @@ -343,7 +343,7 @@ gst_shape_wipe_video_sink_getcaps (GstPad * pad, GstCaps * filter) if (gst_caps_is_empty (ret)) goto done; - tmp = gst_pad_peer_get_caps (pad, NULL); + tmp = gst_pad_peer_query_caps (pad, NULL); GST_LOG_OBJECT (pad, "peerpad accepted caps: %" GST_PTR_FORMAT, tmp); if (tmp) { @@ -372,7 +372,7 @@ gst_shape_wipe_video_sink_getcaps (GstPad * pad, GstCaps * filter) } } - tmp = gst_pad_peer_get_caps (self->mask_sinkpad, NULL); + tmp = gst_pad_peer_query_caps (self->mask_sinkpad, NULL); GST_LOG_OBJECT (pad, "mask accepted caps: %" GST_PTR_FORMAT, tmp); if (tmp) { @@ -456,7 +456,7 @@ gst_shape_wipe_mask_sink_getcaps (GstPad * pad, GstCaps * filter) if (gst_pad_has_current_caps (pad)) return gst_pad_get_current_caps (pad); - tmp = gst_pad_peer_get_caps (self->video_sinkpad, NULL); + tmp = gst_pad_peer_query_caps (self->video_sinkpad, NULL); if (tmp) { ret = gst_caps_intersect (tmp, @@ -471,7 +471,7 @@ gst_shape_wipe_mask_sink_getcaps (GstPad * pad, GstCaps * filter) if (gst_caps_is_empty (ret)) goto done; - tmp = gst_pad_peer_get_caps (self->srcpad, NULL); + tmp = gst_pad_peer_query_caps (self->srcpad, NULL); GST_LOG_OBJECT (pad, "srcpad accepted caps: %" GST_PTR_FORMAT, ret); if (tmp) { @@ -512,7 +512,7 @@ gst_shape_wipe_mask_sink_getcaps (GstPad * pad, GstCaps * filter) } gst_caps_append (ret, tmp); - tmp = gst_pad_peer_get_caps (pad, NULL); + tmp = gst_pad_peer_query_caps (pad, NULL); GST_LOG_OBJECT (pad, "peer accepted caps: %" GST_PTR_FORMAT, tmp); if (tmp) { @@ -543,7 +543,7 @@ gst_shape_wipe_src_getcaps (GstPad * pad, GstCaps * filter) else if (gst_pad_has_current_caps (self->video_sinkpad)) return gst_pad_get_current_caps (self->video_sinkpad); - tmp = gst_pad_peer_get_caps (self->video_sinkpad, NULL); + tmp = gst_pad_peer_query_caps (self->video_sinkpad, NULL); if (tmp) { ret = gst_caps_intersect (tmp, @@ -558,7 +558,7 @@ gst_shape_wipe_src_getcaps (GstPad * pad, GstCaps * filter) if (gst_caps_is_empty (ret)) goto done; - tmp = gst_pad_peer_get_caps (pad, NULL); + tmp = gst_pad_peer_query_caps (pad, NULL); GST_LOG_OBJECT (pad, "peer accepted caps: %" GST_PTR_FORMAT, ret); if (tmp) { GstCaps *intersection; @@ -586,7 +586,7 @@ gst_shape_wipe_src_getcaps (GstPad * pad, GstCaps * filter) } } - tmp = gst_pad_peer_get_caps (self->mask_sinkpad, NULL); + tmp = gst_pad_peer_query_caps (self->mask_sinkpad, NULL); GST_LOG_OBJECT (pad, "mask sink accepted caps: %" GST_PTR_FORMAT, ret); if (tmp) { GstCaps *intersection, *tmp2; diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c index 5912ff5370..e2464f5816 100644 --- a/sys/v4l2/gstv4l2src.c +++ b/sys/v4l2/gstv4l2src.c @@ -327,7 +327,7 @@ gst_v4l2src_negotiate (GstBaseSrc * basesrc) goto no_nego_needed; /* 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); LOG_CAPS (basesrc, peercaps); if (peercaps && !gst_caps_is_any (peercaps)) {