diff options
author | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2002-09-10 09:31:40 +0000 |
---|---|---|
committer | Ronald S. Bultje <rbultje@ronald.bitfreak.net> | 2002-09-10 09:31:40 +0000 |
commit | 0b497b1634b097988451b70aca5bf4190b81c01f (patch) | |
tree | 26ce2f5d73e89d98f284f097727221f777ab4117 /gst | |
parent | dc3b48f77c977d055efa550f01d691d2c4ec110f (diff) |
This updates all plugins to the new API for gst_pad_try_set_caps
Original commit message from CVS:
This updates all plugins to the new API for gst_pad_try_set_caps
Diffstat (limited to 'gst')
-rw-r--r-- | gst/audiofx/audiowsincband.c | 11 | ||||
-rw-r--r-- | gst/audiofx/audiowsinclimit.c | 11 | ||||
-rw-r--r-- | gst/auparse/gstauparse.c | 2 | ||||
-rw-r--r-- | gst/cutter/gstcutter.c | 7 | ||||
-rw-r--r-- | gst/effectv/gstaging.c | 6 | ||||
-rw-r--r-- | gst/effectv/gstdice.c | 6 | ||||
-rw-r--r-- | gst/effectv/gstedge.c | 6 | ||||
-rw-r--r-- | gst/effectv/gstquark.c | 6 | ||||
-rw-r--r-- | gst/effectv/gstrev.c | 6 | ||||
-rw-r--r-- | gst/effectv/gstshagadelic.c | 6 | ||||
-rw-r--r-- | gst/effectv/gstvertigo.c | 6 | ||||
-rw-r--r-- | gst/effectv/gstwarp.c | 6 | ||||
-rw-r--r-- | gst/goom/gstgoom.c | 2 | ||||
-rw-r--r-- | gst/law/alaw-decode.c | 2 | ||||
-rw-r--r-- | gst/law/alaw-encode.c | 2 | ||||
-rw-r--r-- | gst/law/mulaw-decode.c | 9 | ||||
-rw-r--r-- | gst/law/mulaw-encode.c | 2 | ||||
-rw-r--r-- | gst/level/gstlevel.c | 7 | ||||
-rw-r--r-- | gst/median/gstmedian.c | 5 | ||||
-rw-r--r-- | gst/monoscope/gstmonoscope.c | 2 | ||||
-rw-r--r-- | gst/videocrop/gstvideocrop.c | 4 | ||||
-rw-r--r-- | gst/wavparse/gstwavparse.c | 2 |
22 files changed, 35 insertions, 81 deletions
diff --git a/gst/audiofx/audiowsincband.c b/gst/audiofx/audiowsincband.c index 916fcbe9..6ce634d3 100644 --- a/gst/audiofx/audiowsincband.c +++ b/gst/audiofx/audiowsincband.c @@ -179,6 +179,7 @@ gst_bpwsinc_sink_connect (GstPad * pad, GstCaps * caps) double sum = 0.0; int len = 0; double *kernel_lp, *kernel_hp; + GstPadConnectReturn set_retval; GstBPWSinc *filter = GST_BPWSINC (gst_pad_get_parent (pad)); @@ -187,8 +188,10 @@ gst_bpwsinc_sink_connect (GstPad * pad, GstCaps * caps) if (!GST_CAPS_IS_FIXED (caps)) return GST_PAD_CONNECT_DELAYED; - - if (gst_pad_try_set_caps (filter->srcpad, caps)) + + set_retval = gst_pad_try_set_caps (filter->srcpad, caps); + + if (set_retval > 0) { len = filter->wing_size; /* fill the lp kernel */ @@ -259,11 +262,9 @@ gst_bpwsinc_sink_connect (GstPad * pad, GstCaps * caps) /* set up the residue memory space */ filter->residue = (gfloat *) g_malloc (sizeof (gfloat) * (len * 2 + 1)); for (i = 0; i <= len * 2; ++i) filter->residue[i] = 0.0; - - return GST_PAD_CONNECT_OK; } - return GST_PAD_CONNECT_REFUSED; + return set_retval; } static void diff --git a/gst/audiofx/audiowsinclimit.c b/gst/audiofx/audiowsinclimit.c index fc916a82..664df870 100644 --- a/gst/audiofx/audiowsinclimit.c +++ b/gst/audiofx/audiowsinclimit.c @@ -171,14 +171,17 @@ gst_lpwsinc_sink_connect (GstPad * pad, GstCaps * caps) double sum = 0.0; int len = 0; GstLPWSinc *filter = GST_LPWSINC (gst_pad_get_parent (pad)); + GstPadConnectReturn set_retval; g_assert (GST_IS_PAD (pad)); g_assert (caps != NULL); if (!GST_CAPS_IS_FIXED (caps)) return GST_PAD_CONNECT_DELAYED; - - if (gst_pad_try_set_caps (filter->srcpad, caps)) + + set_retval = gst_pad_try_set_caps(filter->srcpad, caps); + + if (set_retval > 0) { /* connection works, so init the filter */ /* FIXME: remember to free it */ @@ -208,11 +211,9 @@ gst_lpwsinc_sink_connect (GstPad * pad, GstCaps * caps) /* set up the residue memory space */ filter->residue = (gfloat *) g_malloc (sizeof (gfloat) * (len * 2 + 1)); for (i = 0; i <= len * 2; ++i) filter->residue[i] = 0.0; - - return GST_PAD_CONNECT_OK; } - return GST_PAD_CONNECT_REFUSED; + return set_retval; } static void diff --git a/gst/auparse/gstauparse.c b/gst/auparse/gstauparse.c index 930461d9..e21b01a4 100644 --- a/gst/auparse/gstauparse.c +++ b/gst/auparse/gstauparse.c @@ -268,7 +268,7 @@ gst_auparse_chain (GstPad *pad, GstBuffer *buf) "width", GST_PROPS_INT (depth), "signed", GST_PROPS_BOOLEAN (sign)); - if (!gst_pad_try_set_caps (auparse->srcpad, tempcaps)) { + if (gst_pad_try_set_caps (auparse->srcpad, tempcaps) <= 0) { gst_buffer_unref (buf); gst_element_error (GST_ELEMENT (auparse), "could not set audio caps"); return; diff --git a/gst/cutter/gstcutter.c b/gst/cutter/gstcutter.c index e8d8e015..87321373 100644 --- a/gst/cutter/gstcutter.c +++ b/gst/cutter/gstcutter.c @@ -119,12 +119,7 @@ gst_cutter_connect (GstPad *pad, GstCaps *caps) otherpad = (pad == filter->srcpad ? filter->sinkpad : filter->srcpad); if (GST_CAPS_IS_FIXED (caps)) - { - if (!gst_pad_try_set_caps (otherpad, caps)) - return GST_PAD_CONNECT_REFUSED; - - return GST_PAD_CONNECT_OK; - } + return gst_pad_try_set_caps (otherpad, caps); return GST_PAD_CONNECT_DELAYED; } diff --git a/gst/effectv/gstaging.c b/gst/effectv/gstaging.c index 3f34b1fa..eb1bb094 100644 --- a/gst/effectv/gstaging.c +++ b/gst/effectv/gstaging.c @@ -164,11 +164,7 @@ gst_agingtv_sinkconnect (GstPad * pad, GstCaps * caps) filter->aging_mode = 0; aging_mode_switch (filter); - if (gst_pad_try_set_caps (filter->srcpad, caps)) { - return GST_PAD_CONNECT_OK; - } - - return GST_PAD_CONNECT_REFUSED; + return gst_pad_try_set_caps (filter->srcpad, caps); } static void diff --git a/gst/effectv/gstdice.c b/gst/effectv/gstdice.c index a46f1b2f..726224ea 100644 --- a/gst/effectv/gstdice.c +++ b/gst/effectv/gstdice.c @@ -170,11 +170,7 @@ gst_dicetv_sinkconnect (GstPad * pad, GstCaps * caps) filter->dicemap = (gchar *) g_malloc (filter->height * filter->width * sizeof(char)); gst_dicetv_create_map (filter); - if (gst_pad_try_set_caps (filter->srcpad, caps)) { - return GST_PAD_CONNECT_OK; - } - - return GST_PAD_CONNECT_REFUSED; + return gst_pad_try_set_caps (filter->srcpad, caps); } static void diff --git a/gst/effectv/gstedge.c b/gst/effectv/gstedge.c index dd0b1b79..2879b868 100644 --- a/gst/effectv/gstedge.c +++ b/gst/effectv/gstedge.c @@ -148,11 +148,7 @@ gst_edgetv_sinkconnect (GstPad * pad, GstCaps * caps) filter->map = (guint32 *)g_malloc (filter->map_width * filter->map_height * sizeof(guint32) * 2); bzero(filter->map, filter->map_width * filter->map_height * sizeof(guint32) * 2); - if (gst_pad_try_set_caps (filter->srcpad, caps)) { - return GST_PAD_CONNECT_OK; - } - - return GST_PAD_CONNECT_REFUSED; + return gst_pad_try_set_caps (filter->srcpad, caps); } static void diff --git a/gst/effectv/gstquark.c b/gst/effectv/gstquark.c index d3a41fa2..489a4901 100644 --- a/gst/effectv/gstquark.c +++ b/gst/effectv/gstquark.c @@ -175,11 +175,7 @@ gst_quarktv_sinkconnect (GstPad * pad, GstCaps * caps) filter->planetable[i] = NULL; } - if (gst_pad_try_set_caps (filter->srcpad, caps)) { - return GST_PAD_CONNECT_OK; - } - - return GST_PAD_CONNECT_REFUSED; + return gst_pad_try_set_caps (filter->srcpad, caps); } static void diff --git a/gst/effectv/gstrev.c b/gst/effectv/gstrev.c index c0d47963..a8cba02f 100644 --- a/gst/effectv/gstrev.c +++ b/gst/effectv/gstrev.c @@ -179,11 +179,7 @@ gst_revtv_sinkconnect (GstPad * pad, GstCaps * caps) gst_caps_get_int (caps, "width", &filter->width); gst_caps_get_int (caps, "height", &filter->height); - if (gst_pad_try_set_caps (filter->srcpad, caps)) { - return GST_PAD_CONNECT_OK; - } - - return GST_PAD_CONNECT_REFUSED; + return gst_pad_try_set_caps (filter->srcpad, caps); } static void diff --git a/gst/effectv/gstshagadelic.c b/gst/effectv/gstshagadelic.c index 7f61f4d3..0f3a40dc 100644 --- a/gst/effectv/gstshagadelic.c +++ b/gst/effectv/gstshagadelic.c @@ -160,11 +160,7 @@ gst_shagadelictv_sinkconnect (GstPad * pad, GstCaps * caps) gst_shagadelic_initialize (filter); - if (gst_pad_try_set_caps (filter->srcpad, caps)) { - return GST_PAD_CONNECT_OK; - } - - return GST_PAD_CONNECT_REFUSED; + return gst_pad_try_set_caps (filter->srcpad, caps); } static void diff --git a/gst/effectv/gstvertigo.c b/gst/effectv/gstvertigo.c index 64130933..3fd90bb7 100644 --- a/gst/effectv/gstvertigo.c +++ b/gst/effectv/gstvertigo.c @@ -194,11 +194,7 @@ gst_vertigotv_sinkconnect (GstPad * pad, GstCaps * caps) filter->alt_buffer = filter->buffer + area; filter->phase = 0; - if (gst_pad_try_set_caps (filter->srcpad, caps)) { - return GST_PAD_CONNECT_OK; - } - - return GST_PAD_CONNECT_REFUSED; + return gst_pad_try_set_caps (filter->srcpad, caps); } static void diff --git a/gst/effectv/gstwarp.c b/gst/effectv/gstwarp.c index c8cafa58..1328e94d 100644 --- a/gst/effectv/gstwarp.c +++ b/gst/effectv/gstwarp.c @@ -158,11 +158,7 @@ gst_warptv_sinkconnect (GstPad * pad, GstCaps * caps) gst_warptv_initialize (filter); - if (gst_pad_try_set_caps (filter->srcpad, caps)) { - return GST_PAD_CONNECT_OK; - } - - return GST_PAD_CONNECT_REFUSED; + return gst_pad_try_set_caps (filter->srcpad, caps); } static void diff --git a/gst/goom/gstgoom.c b/gst/goom/gstgoom.c index 506ec82c..05d02b29 100644 --- a/gst/goom/gstgoom.c +++ b/gst/goom/gstgoom.c @@ -268,7 +268,7 @@ gst_goom_chain (GstPad *pad, GstBuffer *bufin) "height", GST_PROPS_INT (goom->height) ); - if (!gst_pad_try_set_caps (goom->srcpad, caps)) { + if (gst_pad_try_set_caps (goom->srcpad, caps) <= 0) { gst_element_error (GST_ELEMENT (goom), "could not set caps"); return; } diff --git a/gst/law/alaw-decode.c b/gst/law/alaw-decode.c index 1ce5edd4..9806f0ef 100644 --- a/gst/law/alaw-decode.c +++ b/gst/law/alaw-decode.c @@ -65,7 +65,7 @@ alawdec_negotiate_sink (GstPad *pad, GstCaps **caps, gint counter) gst_caps_set(tempcaps,"width",GST_PROPS_INT(16)); gst_caps_set(tempcaps,"signed",GST_PROPS_BOOLEAN(TRUE)); - if (gst_pad_try_set_caps (alawdec->srcpad, tempcaps)) + if (gst_pad_try_set_caps (alawdec->srcpad, tempcaps) > 0) { return GST_PAD_NEGOTIATE_AGREE; } diff --git a/gst/law/alaw-encode.c b/gst/law/alaw-encode.c index 853a56f8..f7ebed18 100644 --- a/gst/law/alaw-encode.c +++ b/gst/law/alaw-encode.c @@ -66,7 +66,7 @@ alawenc_negotiate_sink (GstPad *pad, GstCaps **caps, gint counter) gst_caps_set(tempcaps,"width",GST_PROPS_INT(8)); gst_caps_set(tempcaps,"signed",GST_PROPS_BOOLEAN(FALSE)); - if (gst_pad_try_set_caps (alawenc->srcpad, tempcaps)) + if (gst_pad_try_set_caps (alawenc->srcpad, tempcaps) > 0) { return GST_PAD_NEGOTIATE_AGREE; } diff --git a/gst/law/mulaw-decode.c b/gst/law/mulaw-decode.c index 2f95f056..3585a9cb 100644 --- a/gst/law/mulaw-decode.c +++ b/gst/law/mulaw-decode.c @@ -64,13 +64,8 @@ mulawdec_connect_sink (GstPad *pad, GstCaps *caps) gst_caps_set(newcaps,"width",GST_PROPS_INT(16)); gst_caps_set(newcaps,"signed",GST_PROPS_BOOLEAN(TRUE)); - if (GST_CAPS_IS_FIXED (newcaps)) { - if (gst_pad_try_set_caps (mulawdec->srcpad, newcaps)) - return GST_PAD_CONNECT_OK; - else - return GST_PAD_CONNECT_REFUSED; - } - + if (GST_CAPS_IS_FIXED (newcaps)) + return gst_pad_try_set_caps (mulawdec->srcpad, newcaps); return GST_PAD_CONNECT_DELAYED; } diff --git a/gst/law/mulaw-encode.c b/gst/law/mulaw-encode.c index 5d9090f5..23648780 100644 --- a/gst/law/mulaw-encode.c +++ b/gst/law/mulaw-encode.c @@ -65,7 +65,7 @@ mulawenc_negotiate_sink (GstPad *pad, GstCaps **caps, gint counter) gst_caps_set(tempcaps,"width",GST_PROPS_INT(8)); gst_caps_set(tempcaps,"signed",GST_PROPS_BOOLEAN(FALSE)); - if (gst_pad_try_set_caps (mulawenc->srcpad, tempcaps)) + if (gst_pad_try_set_caps (mulawenc->srcpad, tempcaps) > 0) { return GST_PAD_NEGOTIATE_AGREE; } diff --git a/gst/level/gstlevel.c b/gst/level/gstlevel.c index debab4b7..449e2fdb 100644 --- a/gst/level/gstlevel.c +++ b/gst/level/gstlevel.c @@ -132,11 +132,8 @@ gst_level_connect (GstPad *pad, GstCaps *caps) if (GST_CAPS_IS_FIXED (caps)) { - if (/* !volume_parse_caps (filter, caps) || */ - !gst_pad_try_set_caps (otherpad, caps)) - return GST_PAD_CONNECT_REFUSED; - - return GST_PAD_CONNECT_OK; + /*if ( !volume_parse_caps (filter, caps) || */ + return gst_pad_try_set_caps (otherpad, caps); } return GST_PAD_CONNECT_DELAYED; } diff --git a/gst/median/gstmedian.c b/gst/median/gstmedian.c index 2e8710a9..4e4dd496 100644 --- a/gst/median/gstmedian.c +++ b/gst/median/gstmedian.c @@ -138,10 +138,7 @@ gst_median_sinkconnect (GstPad *pad, GstCaps *caps) gst_caps_get_int (caps, "height", &filter->height); /* forward to the next plugin */ - if (!gst_pad_try_set_caps(filter->srcpad, gst_caps_copy_1(caps))) - return GST_PAD_CONNECT_REFUSED; - - return GST_PAD_CONNECT_OK; + return gst_pad_try_set_caps(filter->srcpad, gst_caps_copy_1(caps)); } void gst_median_init (GstMedian *median) diff --git a/gst/monoscope/gstmonoscope.c b/gst/monoscope/gstmonoscope.c index cad9c34f..a255e861 100644 --- a/gst/monoscope/gstmonoscope.c +++ b/gst/monoscope/gstmonoscope.c @@ -273,7 +273,7 @@ gst_monoscope_chain (GstPad *pad, GstBuffer *bufin) "height", GST_PROPS_INT (monoscope->height) ); - if (!gst_pad_try_set_caps (monoscope->srcpad, caps)) { + if (gst_pad_try_set_caps (monoscope->srcpad, caps) <= 0) { gst_element_error (GST_ELEMENT (monoscope), "could not set caps"); return; } diff --git a/gst/videocrop/gstvideocrop.c b/gst/videocrop/gstvideocrop.c index d1cc5af4..0554042e 100644 --- a/gst/videocrop/gstvideocrop.c +++ b/gst/videocrop/gstvideocrop.c @@ -341,14 +341,14 @@ gst_video_crop_chain (GstPad *pad, GstBuffer *buffer) } if (GST_PAD_CAPS (video_crop->srcpad) == NULL) { - if (!gst_pad_try_set_caps (video_crop->srcpad, + if (gst_pad_try_set_caps (video_crop->srcpad, GST_CAPS_NEW ( "video_crop_caps", "video/raw", "format", GST_PROPS_FOURCC (GST_STR_FOURCC ("I420")), "width", GST_PROPS_INT (video_crop->crop_width), "height", GST_PROPS_INT (video_crop->crop_height) - ))) + )) <= 0) { gst_element_error (GST_ELEMENT (video_crop), "could not negotiate pads"); return; diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c index 76547eda..e4fdca05 100644 --- a/gst/wavparse/gstwavparse.c +++ b/gst/wavparse/gstwavparse.c @@ -275,7 +275,7 @@ gst_wavparse_chain (GstPad *pad, GstBuffer *buf) "channels", GST_PROPS_INT (format->wChannels) ); - if (!gst_pad_try_set_caps (wavparse->srcpad, caps)) { + if (gst_pad_try_set_caps (wavparse->srcpad, caps) <= 0) { gst_element_error (GST_ELEMENT (wavparse), "Could not set caps"); return; } |