From 2ecb08f2bdb49d9bb1ef7d4086918a462b4a24a2 Mon Sep 17 00:00:00 2001 From: David Schleef Date: Wed, 31 Dec 2003 08:09:38 +0000 Subject: [PATCH] Negotiation fixes Original commit message from CVS: Negotiation fixes --- ChangeLog | 7 +++++++ gst/elements/gstshaper.c | 2 +- gst/elements/gsttee.c | 50 ++++---------------------------------------- gst/gstqueue.c | 2 +- plugins/elements/gstqueue.c | 2 +- plugins/elements/gstshaper.c | 2 +- plugins/elements/gsttee.c | 50 ++++---------------------------------------- 7 files changed, 19 insertions(+), 96 deletions(-) diff --git a/ChangeLog b/ChangeLog index 90fe9c8..4c3d09b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2003-12-31 David Schleef + * gst/elements/gstshaper.c: (gst_shaper_link): + * gst/elements/gsttee.c: (gst_tee_init), (gst_tee_request_new_pad): + * gst/gstqueue.c: (gst_queue_link): + Negotiation fixes. + +2003-12-31 David Schleef + * gst/gstpad.c: (gst_pad_proxy_pad_link), (gst_pad_proxy_fixate): * gst/gstpad.h: Add functions that are useful as default pad link and fixate functions for elements. diff --git a/gst/elements/gstshaper.c b/gst/elements/gstshaper.c index 90ca3cd..5ec9873 100644 --- a/gst/elements/gstshaper.c +++ b/gst/elements/gstshaper.c @@ -213,7 +213,7 @@ gst_shaper_link (GstPad *pad, const GstCaps *caps) otherpad = (pad == connection->srcpad ? connection->sinkpad : connection->srcpad); - return gst_pad_proxy_link (otherpad, caps); + return gst_pad_try_set_caps (otherpad, caps); } static GstShaperConnection* diff --git a/gst/elements/gsttee.c b/gst/elements/gsttee.c index ef16afb..55eb46e 100644 --- a/gst/elements/gsttee.c +++ b/gst/elements/gsttee.c @@ -137,58 +137,15 @@ gst_tee_class_init (GstTeeClass *klass) gstelement_class->request_new_pad = GST_DEBUG_FUNCPTR(gst_tee_request_new_pad); } -static GstPadLinkReturn -gst_tee_sinklink (GstPad *pad, const GstCaps *caps) -{ - GstTee *tee; - const GList *pads; - GstPadLinkReturn set_retval; - - GST_DEBUG ( "gst_tee_sinklink caps=%s", gst_caps_to_string(caps)); - - tee = GST_TEE (gst_pad_get_parent (pad)); - - if (!gst_caps_is_fixed (caps)) { - return GST_PAD_LINK_DELAYED; - } - - /* go through all the src pads */ - pads = gst_element_get_pad_list (GST_ELEMENT (tee)); - - while (pads) { - GstPad *outpad = GST_PAD (pads->data); - pads = g_list_next (pads); - - if (GST_PAD_DIRECTION (outpad) != GST_PAD_SRC || !GST_PAD_IS_LINKED (outpad)) - continue; - - if ((set_retval = gst_pad_try_set_caps (outpad, caps)) <= 0) { - return set_retval; - } - } - return GST_PAD_LINK_OK; -} - -static GstPadLinkReturn -gst_tee_srclink (GstPad *pad, const GstCaps *caps) -{ - GstTee *tee; - - GST_DEBUG ( "gst_tee_srclink caps=%s", gst_caps_to_string(caps)); - - tee = GST_TEE (gst_pad_get_parent (pad)); - - return gst_pad_proxy_link (tee->sinkpad, caps); -} - static void gst_tee_init (GstTee *tee) { tee->sinkpad = gst_pad_new ("sink", GST_PAD_SINK); gst_element_add_pad (GST_ELEMENT (tee), tee->sinkpad); gst_pad_set_chain_function (tee->sinkpad, GST_DEBUG_FUNCPTR (gst_tee_chain)); - gst_pad_set_link_function (tee->sinkpad, GST_DEBUG_FUNCPTR (gst_tee_sinklink)); + gst_pad_set_link_function (tee->sinkpad, GST_DEBUG_FUNCPTR (gst_pad_proxy_pad_link)); gst_pad_set_getcaps_function (tee->sinkpad, GST_DEBUG_FUNCPTR (gst_pad_proxy_getcaps)); + gst_pad_set_fixate_function (tee->sinkpad, GST_DEBUG_FUNCPTR (gst_pad_proxy_fixate)); tee->silent = FALSE; tee->last_message = NULL; @@ -246,8 +203,9 @@ gst_tee_request_new_pad (GstElement *element, GstPadTemplate *templ, const gchar srcpad = gst_pad_new_from_template (templ, name); g_free (name); - gst_pad_set_link_function (srcpad, GST_DEBUG_FUNCPTR (gst_tee_srclink)); + gst_pad_set_link_function (srcpad, GST_DEBUG_FUNCPTR (gst_pad_proxy_pad_link)); gst_pad_set_getcaps_function (srcpad, GST_DEBUG_FUNCPTR (gst_pad_proxy_getcaps)); + gst_pad_set_fixate_function (srcpad, GST_DEBUG_FUNCPTR (gst_pad_proxy_fixate)); gst_element_add_pad (GST_ELEMENT (tee), srcpad); GST_PAD_ELEMENT_PRIVATE (srcpad) = NULL; diff --git a/gst/gstqueue.c b/gst/gstqueue.c index d0139e8..d00ca1d 100644 --- a/gst/gstqueue.c +++ b/gst/gstqueue.c @@ -332,7 +332,7 @@ gst_queue_otherpad (GstPad *pad) static GstPadLinkReturn gst_queue_link (GstPad *pad, const GstCaps *caps) { - return gst_pad_proxy_link (gst_queue_otherpad (pad), caps); + return gst_pad_try_set_caps (gst_queue_otherpad (pad), caps); } static GstCaps * diff --git a/plugins/elements/gstqueue.c b/plugins/elements/gstqueue.c index d0139e8..d00ca1d 100644 --- a/plugins/elements/gstqueue.c +++ b/plugins/elements/gstqueue.c @@ -332,7 +332,7 @@ gst_queue_otherpad (GstPad *pad) static GstPadLinkReturn gst_queue_link (GstPad *pad, const GstCaps *caps) { - return gst_pad_proxy_link (gst_queue_otherpad (pad), caps); + return gst_pad_try_set_caps (gst_queue_otherpad (pad), caps); } static GstCaps * diff --git a/plugins/elements/gstshaper.c b/plugins/elements/gstshaper.c index 90ca3cd..5ec9873 100644 --- a/plugins/elements/gstshaper.c +++ b/plugins/elements/gstshaper.c @@ -213,7 +213,7 @@ gst_shaper_link (GstPad *pad, const GstCaps *caps) otherpad = (pad == connection->srcpad ? connection->sinkpad : connection->srcpad); - return gst_pad_proxy_link (otherpad, caps); + return gst_pad_try_set_caps (otherpad, caps); } static GstShaperConnection* diff --git a/plugins/elements/gsttee.c b/plugins/elements/gsttee.c index ef16afb..55eb46e 100644 --- a/plugins/elements/gsttee.c +++ b/plugins/elements/gsttee.c @@ -137,58 +137,15 @@ gst_tee_class_init (GstTeeClass *klass) gstelement_class->request_new_pad = GST_DEBUG_FUNCPTR(gst_tee_request_new_pad); } -static GstPadLinkReturn -gst_tee_sinklink (GstPad *pad, const GstCaps *caps) -{ - GstTee *tee; - const GList *pads; - GstPadLinkReturn set_retval; - - GST_DEBUG ( "gst_tee_sinklink caps=%s", gst_caps_to_string(caps)); - - tee = GST_TEE (gst_pad_get_parent (pad)); - - if (!gst_caps_is_fixed (caps)) { - return GST_PAD_LINK_DELAYED; - } - - /* go through all the src pads */ - pads = gst_element_get_pad_list (GST_ELEMENT (tee)); - - while (pads) { - GstPad *outpad = GST_PAD (pads->data); - pads = g_list_next (pads); - - if (GST_PAD_DIRECTION (outpad) != GST_PAD_SRC || !GST_PAD_IS_LINKED (outpad)) - continue; - - if ((set_retval = gst_pad_try_set_caps (outpad, caps)) <= 0) { - return set_retval; - } - } - return GST_PAD_LINK_OK; -} - -static GstPadLinkReturn -gst_tee_srclink (GstPad *pad, const GstCaps *caps) -{ - GstTee *tee; - - GST_DEBUG ( "gst_tee_srclink caps=%s", gst_caps_to_string(caps)); - - tee = GST_TEE (gst_pad_get_parent (pad)); - - return gst_pad_proxy_link (tee->sinkpad, caps); -} - static void gst_tee_init (GstTee *tee) { tee->sinkpad = gst_pad_new ("sink", GST_PAD_SINK); gst_element_add_pad (GST_ELEMENT (tee), tee->sinkpad); gst_pad_set_chain_function (tee->sinkpad, GST_DEBUG_FUNCPTR (gst_tee_chain)); - gst_pad_set_link_function (tee->sinkpad, GST_DEBUG_FUNCPTR (gst_tee_sinklink)); + gst_pad_set_link_function (tee->sinkpad, GST_DEBUG_FUNCPTR (gst_pad_proxy_pad_link)); gst_pad_set_getcaps_function (tee->sinkpad, GST_DEBUG_FUNCPTR (gst_pad_proxy_getcaps)); + gst_pad_set_fixate_function (tee->sinkpad, GST_DEBUG_FUNCPTR (gst_pad_proxy_fixate)); tee->silent = FALSE; tee->last_message = NULL; @@ -246,8 +203,9 @@ gst_tee_request_new_pad (GstElement *element, GstPadTemplate *templ, const gchar srcpad = gst_pad_new_from_template (templ, name); g_free (name); - gst_pad_set_link_function (srcpad, GST_DEBUG_FUNCPTR (gst_tee_srclink)); + gst_pad_set_link_function (srcpad, GST_DEBUG_FUNCPTR (gst_pad_proxy_pad_link)); gst_pad_set_getcaps_function (srcpad, GST_DEBUG_FUNCPTR (gst_pad_proxy_getcaps)); + gst_pad_set_fixate_function (srcpad, GST_DEBUG_FUNCPTR (gst_pad_proxy_fixate)); gst_element_add_pad (GST_ELEMENT (tee), srcpad); GST_PAD_ELEMENT_PRIVATE (srcpad) = NULL; -- 2.7.4