From: <wt...@fr...> - 2005-07-29 19:22:47
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: wtay Date: Fri Jul 29 2005 12:22:40 PDT Log message: * check/gst/gstghostpad.c: (GST_START_TEST), (gst_ghost_pad_suite): Added test for removing an element with ghostpad from a bin. Fixed test as current implementation does the right thing. * gst/gstghostpad.c: (gst_proxy_pad_class_init), (gst_proxy_pad_do_query_type), (gst_proxy_pad_do_event), (gst_proxy_pad_do_query), (gst_proxy_pad_do_internal_link), (gst_proxy_pad_do_bufferalloc), (gst_proxy_pad_do_activate), (gst_proxy_pad_do_activatepull), (gst_proxy_pad_do_activatepush), (gst_proxy_pad_do_chain), (gst_proxy_pad_do_getrange), (gst_proxy_pad_do_checkgetrange), (gst_proxy_pad_do_getcaps), (gst_proxy_pad_do_acceptcaps), (gst_proxy_pad_do_fixatecaps), (gst_proxy_pad_do_setcaps), (gst_proxy_pad_set_target), (gst_proxy_pad_get_target), (gst_proxy_pad_init), (gst_proxy_pad_dispose), (gst_proxy_pad_finalize), (gst_ghost_pad_class_init), (gst_ghost_pad_do_activate_push), (gst_ghost_pad_do_link), (gst_ghost_pad_do_unlink), (gst_ghost_pad_set_internal), (gst_ghost_pad_dispose), (gst_ghost_pad_new_notarget), (gst_ghost_pad_new), (gst_ghost_pad_get_target), (gst_ghost_pad_set_target): * gst/gstghostpad.h: Clean up ghostpads, remove properties for internal stuff. Make threadsafe. Fix refcounting. Prepare for switching targets, not all use cases work yet. Modified files: . : ChangeLog check/gst : gstghostpad.c gst : gstghostpad.c gstghostpad.h Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.1316&r2=1.1317 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/check/gst/gstghostpad.c.diff?r1=1.6&r2=1.7 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstghostpad.c.diff?r1=1.15&r2=1.16 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/gstghostpad.h.diff?r1=1.1&r2=1.2 ====Begin Diffs==== Index: gstghostpad.c =================================================================== RCS file: /cvs/gstreamer/gstreamer/gst/gstghostpad.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- gstghostpad.c 18 Jul 2005 12:49:52 -0000 1.15 +++ gstghostpad.c 29 Jul 2005 19:22:28 -0000 1.16 @@ -37,21 +37,18 @@ typedef struct _GstProxyPad GstProxyPad; typedef struct _GstProxyPadClass GstProxyPadClass; - -enum -{ - PROXY_PROP_0, - PROXY_PROP_TARGET -}; +#define GST_PROXY_GET_LOCK(pad) (GST_PROXY_PAD (pad)->proxy_lock) +#define GST_PROXY_LOCK(pad) (g_mutex_lock (GST_PROXY_GET_LOCK (pad))) +#define GST_PROXY_UNLOCK(pad) (g_mutex_unlock (GST_PROXY_GET_LOCK (pad))) struct _GstProxyPad { GstPad pad; + /* with PROXY_LOCK */ + GMutex *proxy_lock; GstPad *target; - GMutex *property_lock; /*< private > */ gpointer _gst_reserved[1]; }; @@ -67,12 +64,9 @@ G_DEFINE_TYPE (GstProxyPad, gst_proxy_pad, GST_TYPE_PAD); +static GstPad *gst_proxy_pad_get_target (GstPad * pad); static void gst_proxy_pad_dispose (GObject * object); -static void gst_proxy_pad_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec); -static void gst_proxy_pad_get_property (GObject * object, guint prop_id, - GValue * value, GParamSpec * pspec); static void gst_proxy_pad_finalize (GObject * object); #ifndef GST_DISABLE_LOADSAVE @@ -88,12 +82,6 @@ gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_proxy_pad_dispose); gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_proxy_pad_finalize); - gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_proxy_pad_set_property); - gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_proxy_pad_get_property); - g_object_class_install_property (G_OBJECT_CLASS (klass), PROXY_PROP_TARGET, - g_param_spec_object ("target", "Target", "The proxy pad's target", - GST_TYPE_PAD, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); { @@ -108,41 +96,57 @@ const GstQueryType * gst_proxy_pad_do_query_type (GstPad * pad) - GstPad *target = GST_PROXY_PAD_TARGET (pad); + GstPad *target = gst_proxy_pad_get_target (pad); + const GstQueryType *res; g_return_val_if_fail (target != NULL, NULL); - return gst_pad_get_query_types (target); + res = gst_pad_get_query_types (target); + gst_object_unref (target); + + return res; } static gboolean gst_proxy_pad_do_event (GstPad * pad, GstEvent * event) + gboolean res; g_return_val_if_fail (target != NULL, FALSE); - return gst_pad_send_event (target, event); + res = gst_pad_send_event (target, event); gst_proxy_pad_do_query (GstPad * pad, GstQuery * query) - return gst_pad_query (target, query); + res = gst_pad_query (target, query); static GList * gst_proxy_pad_do_internal_link (GstPad * pad) + GList *res; - return gst_pad_get_internal_links (target); + res = gst_pad_get_internal_links (target); static GstFlowReturn @@ -150,7 +154,7 @@ GstCaps * caps, GstBuffer ** buf) GstFlowReturn result; GstPad *peer; g_return_val_if_fail (target != NULL, GST_FLOW_NOT_LINKED); @@ -166,24 +170,27 @@ result = GST_FLOW_NOT_LINKED; } return result; gst_proxy_pad_do_activate (GstPad * pad) - g_return_val_if_fail (target != NULL, FALSE); + res = gst_pad_activate_push (pad, TRUE); - return gst_pad_activate_push (pad, TRUE); gst_proxy_pad_do_activatepull (GstPad * pad, gboolean active) GstActivateMode old; @@ -193,16 +200,20 @@ if ((active && old == GST_ACTIVATE_PULL) || (!active && old == GST_ACTIVATE_NONE)) - return TRUE; + res = TRUE; else - return gst_pad_activate_pull (target, active); + res = gst_pad_activate_pull (target, active); gst_proxy_pad_do_activatepush (GstPad * pad, gboolean active) @@ -212,40 +223,52 @@ if ((active && old == GST_ACTIVATE_PUSH) - return gst_pad_activate_push (target, active); + res = gst_pad_activate_push (target, active); gst_proxy_pad_do_chain (GstPad * pad, GstBuffer * buffer) + GstFlowReturn res; - return gst_pad_chain (target, buffer); + res = gst_pad_chain (target, buffer); gst_proxy_pad_do_getrange (GstPad * pad, guint64 offset, guint size, GstBuffer ** buffer) - return gst_pad_get_range (target, offset, size, buffer); + res = gst_pad_get_range (target, offset, size, buffer); gst_proxy_pad_do_checkgetrange (GstPad * pad) gboolean result; peer = gst_pad_get_peer (target); if (peer) { result = gst_pad_check_pull_range (peer); @@ -253,115 +276,126 @@ } else { result = FALSE; static GstCaps * gst_proxy_pad_do_getcaps (GstPad * pad) + GstCaps *res; - return gst_pad_get_caps (target); + res = gst_pad_get_caps (target); gst_proxy_pad_do_acceptcaps (GstPad * pad, GstCaps * caps) - return gst_pad_accept_caps (target, caps); + res = gst_pad_accept_caps (target, caps); static void gst_proxy_pad_do_fixatecaps (GstPad * pad, GstCaps * caps) g_return_if_fail (target != NULL); gst_pad_fixate_caps (target, caps); gst_proxy_pad_do_setcaps (GstPad * pad, GstCaps * caps) - return gst_pad_set_caps (target, caps); + res = gst_pad_set_caps (target, caps); #define SETFUNC(member, kind) \ if (target->member) \ gst_pad_set_##kind##_function (pad, gst_proxy_pad_do_##kind) -static void -gst_proxy_pad_set_property (GObject * object, guint prop_id, - const GValue * value, GParamSpec * pspec) +static gboolean +gst_proxy_pad_set_target (GstPad * pad, GstPad * target) - GstPad *pad = GST_PAD (object); - switch (prop_id) { - case PROXY_PROP_TARGET:{ - GstPad *target; - target = GST_PAD_CAST (gst_object_ref - (GST_OBJECT_CAST (g_value_get_object (value)))); - GST_PROXY_PAD_TARGET (object) = target; + GST_PROXY_LOCK (pad); + /* clear old target */ + if (GST_PROXY_PAD_TARGET (pad)) { + gst_object_unref (GST_PROXY_PAD_TARGET (pad)); + GST_PROXY_PAD_TARGET (pad) = NULL; + } - /* really, all these should have default implementations so I can set them - * in the _init() instead of here */ - SETFUNC (querytypefunc, query_type); - SETFUNC (eventfunc, event); - SETFUNC (queryfunc, query); - SETFUNC (intlinkfunc, internal_link); - SETFUNC (activatefunc, activate); - SETFUNC (activatepullfunc, activatepull); - SETFUNC (activatepushfunc, activatepush); - SETFUNC (getcapsfunc, getcaps); - SETFUNC (acceptcapsfunc, acceptcaps); - SETFUNC (fixatecapsfunc, fixatecaps); - SETFUNC (setcapsfunc, setcaps); + if (target) { + /* set and ref new target if any */ + GST_PROXY_PAD_TARGET (pad) = gst_object_ref (target); - if (GST_PAD_DIRECTION (pad) == GST_PAD_SINK) { - SETFUNC (bufferallocfunc, bufferalloc); - SETFUNC (chainfunc, chain); - } else { - SETFUNC (getrangefunc, getrange); - SETFUNC (checkgetrangefunc, checkgetrange); - } + /* really, all these should have default implementations so I can set them + * in the _init() instead of here */ + SETFUNC (querytypefunc, query_type); + SETFUNC (eventfunc, event); + SETFUNC (queryfunc, query); + SETFUNC (intlinkfunc, internal_link); + SETFUNC (activatefunc, activate); + SETFUNC (activatepullfunc, activatepull); + SETFUNC (activatepushfunc, activatepush); + SETFUNC (getcapsfunc, getcaps); + SETFUNC (acceptcapsfunc, acceptcaps); + SETFUNC (fixatecapsfunc, fixatecaps); + SETFUNC (setcapsfunc, setcaps); - break; + if (GST_PAD_DIRECTION (pad) == GST_PAD_SINK) { + SETFUNC (bufferallocfunc, bufferalloc); + SETFUNC (chainfunc, chain); + } else { + SETFUNC (getrangefunc, getrange); + SETFUNC (checkgetrangefunc, checkgetrange); } - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + GST_PROXY_UNLOCK (pad); + return TRUE; -gst_proxy_pad_get_property (GObject * object, guint prop_id, - GValue * value, GParamSpec * pspec) +static GstPad * +gst_proxy_pad_get_target (GstPad * pad) - case PROXY_PROP_TARGET: - g_value_set_object (value, GST_PROXY_PAD_TARGET (object)); - } + GstPad *target; + target = GST_PROXY_PAD_TARGET (pad); + gst_object_ref (target); + return target; gst_proxy_pad_init (GstProxyPad * pad) - pad->property_lock = g_mutex_new (); + pad->proxy_lock = g_mutex_new (); @@ -369,9 +403,9 @@ GstPad *pad = GST_PAD (object); - if (GST_PROXY_PAD_TARGET (pad)) { - gst_object_replace ((GstObject **) & GST_PROXY_PAD_TARGET (pad), NULL); + gst_object_replace ((GstObject **) & GST_PROXY_PAD_TARGET (pad), NULL); G_OBJECT_CLASS (gst_proxy_pad_parent_class)->dispose (object); @@ -381,8 +415,8 @@ GstProxyPad *pad = GST_PROXY_PAD (object); - g_mutex_free (pad->property_lock); - pad->property_lock = NULL; + g_mutex_free (pad->proxy_lock); + pad->proxy_lock = NULL; G_OBJECT_CLASS (gst_proxy_pad_parent_class)->finalize (object); @@ -422,16 +456,11 @@ */ - GHOST_PROP_0, - GHOST_PROP_INTERNAL struct _GstGhostPad GstProxyPad pad; GstPad *internal; gulong notify_id; @@ -450,13 +479,10 @@ G_DEFINE_TYPE (GstGhostPad, gst_ghost_pad, GST_TYPE_PROXY_PAD); +static gboolean gst_ghost_pad_set_internal (GstGhostPad * pad, + GstPad * internal); static void gst_ghost_pad_dispose (GObject * object); -static void gst_ghost_pad_set_property (GObject * object, guint prop_id, -static void gst_ghost_pad_get_property (GObject * object, guint prop_id, /* Work around g_logv's use of G_GNUC_PRINTF because gcc chokes on %P, which we * use for GST_PTR_FORMAT. */ @@ -476,12 +502,6 @@ GObjectClass *gobject_class = (GObjectClass *) klass; gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_ghost_pad_dispose); - gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_ghost_pad_set_property); - gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_ghost_pad_get_property); - g_object_class_install_property (G_OBJECT_CLASS (klass), GHOST_PROP_INTERNAL, - g_param_spec_object ("internal", "Internal", - "The ghost pad's internal pad", GST_TYPE_PAD, G_PARAM_READWRITE)); /* will only be called for src pads (afaict) */ @@ -511,10 +531,10 @@ ret = gst_proxy_pad_do_activatepush (pad, active); - GST_LOCK (pad); if ((internal = GST_GHOST_PAD (pad)->internal)) gst_object_ref (internal); - GST_UNLOCK (pad); if (internal) { ret &= gst_pad_activate_push (internal, active); @@ -528,41 +548,49 @@ gst_ghost_pad_do_link (GstPad * pad, GstPad * peer) GstPad *internal, *target; + GstPadLinkReturn ret; + target = gst_proxy_pad_get_target (pad); - target = GST_PROXY_PAD_TARGET (pad); g_return_val_if_fail (target != NULL, GST_PAD_LINK_NOSCHED); /* proxy the peer into the bin */ internal = g_object_new (GST_TYPE_PROXY_PAD, "name", NULL, "direction", GST_PAD_DIRECTION (peer), - "template", GST_PAD_PAD_TEMPLATE (peer), "target", peer, NULL); - g_object_set (pad, "internal", internal, NULL); + "template", GST_PAD_PAD_TEMPLATE (peer), NULL); - if ((GST_PAD_IS_SRC (internal) && - gst_pad_link (internal, target) == GST_PAD_LINK_OK) || - (GST_PAD_IS_SINK (internal) && - (gst_pad_link (target, internal) == GST_PAD_LINK_OK))) { + gst_proxy_pad_set_target (internal, peer); + gst_ghost_pad_set_internal (GST_GHOST_PAD (pad), internal); + if (GST_PAD_IS_SRC (internal)) + ret = gst_pad_link (internal, target); + else + ret = gst_pad_link (target, internal); + if (ret == GST_PAD_LINK_OK) gst_pad_set_active (internal, GST_PAD_ACTIVATE_MODE (pad)); - return GST_PAD_LINK_OK; - } else { - g_object_set (pad, "internal", NULL, NULL); - return GST_PAD_LINK_REFUSED; + gst_ghost_pad_set_internal (GST_GHOST_PAD (pad), NULL); + return ret; gst_ghost_pad_do_unlink (GstPad * pad) if (target->unlinkfunc) target->unlinkfunc (target); - /* FIXME: should do this here, but locks in deep_notify prevent it */ - /* g_object_set (pad, "internal", NULL, NULL); */ + gst_ghost_pad_set_internal (GST_GHOST_PAD (pad), NULL); @@ -581,84 +609,57 @@ gst_caps_unref (caps); -gst_ghost_pad_set_property (GObject * object, guint prop_id, +gst_ghost_pad_set_internal (GstGhostPad * pad, GstPad * internal) - GstGhostPad *pad = GST_GHOST_PAD (object); - case GHOST_PROP_INTERNAL:{ - GstPad *internal; - g_mutex_lock (GST_PROXY_PAD (pad)->property_lock); - if (pad->internal) { - GstPad *intpeer; - gst_pad_set_activatepull_function (pad->internal, NULL); - g_signal_handler_disconnect (pad->internal, pad->notify_id); - intpeer = gst_pad_get_peer (pad->internal); - if (intpeer) { - if (GST_PAD_IS_SRC (pad->internal)) { - gst_pad_unlink (pad->internal, intpeer); - } else { - gst_pad_unlink (intpeer, pad->internal); - } - gst_object_unref (intpeer); - } - /* should dispose it */ - gst_object_unparent (GST_OBJECT_CAST (pad->internal)); + /* first remove old internal pad */ + if (pad->internal) { + GstPad *intpeer; - internal = g_value_get_object (value); /* no extra refcount... */ + gst_pad_set_activatepull_function (pad->internal, NULL); - if (internal) { - if (!gst_object_set_parent (GST_OBJECT_CAST (internal), - GST_OBJECT_CAST (pad))) { - gst_critical ("Could not set internal pad %" GST_PTR_FORMAT, - internal); - g_mutex_unlock (GST_PROXY_PAD (pad)->property_lock); - return; + g_signal_handler_disconnect (pad->internal, pad->notify_id); - /* could be more general here, iterating over all writable properties... - * taking the short road for now tho */ - pad->notify_id = g_signal_connect (internal, "notify::caps", - G_CALLBACK (on_int_notify), pad); - on_int_notify (internal, NULL, pad); - gst_pad_set_activatepull_function (internal, - gst_ghost_proxy_pad_do_activate_pull); + intpeer = gst_pad_get_peer (pad->internal); + if (intpeer) { + if (GST_PAD_IS_SRC (pad->internal)) + gst_pad_unlink (pad->internal, intpeer); + else + gst_pad_unlink (intpeer, pad->internal); + gst_object_unref (intpeer); + } + /* should dispose it */ + gst_object_unparent (GST_OBJECT_CAST (pad->internal)); - /* a ref was taken by set_parent */ + /* then set new internal pad */ + if (internal) { + if (!gst_object_set_parent (GST_OBJECT_CAST (internal), + GST_OBJECT_CAST (pad))) + goto could_not_set; - pad->internal = internal; + /* could be more general here, iterating over all writable properties... + * taking the short road for now tho */ + pad->notify_id = g_signal_connect (internal, "notify::caps", + G_CALLBACK (on_int_notify), pad); + on_int_notify (internal, NULL, pad); + gst_pad_set_activatepull_function (internal, + gst_ghost_proxy_pad_do_activate_pull); + /* a ref was taken by set_parent */ + pad->internal = internal; - g_mutex_unlock (GST_PROXY_PAD (pad)->property_lock); - } -} -gst_ghost_pad_get_property (GObject * object, guint prop_id, - case GHOST_PROP_INTERNAL: - g_value_set_object (value, GST_GHOST_PAD (object)->internal); + /* ERRORS */ +could_not_set: + { + gst_critical ("Could not set internal pad %" GST_PTR_FORMAT, internal); + GST_PROXY_UNLOCK (pad); + return FALSE; @@ -671,16 +672,46 @@ gst_ghost_pad_dispose (GObject * object) - g_object_set (object, "internal", NULL, NULL); + gst_ghost_pad_set_internal (GST_GHOST_PAD (object), NULL); G_OBJECT_CLASS (gst_ghost_pad_parent_class)->dispose (object); /** + * gst_ghost_pad_new_notarget: + * @name: the name of the new pad, or NULL to assign a default name. + * @dir: the direction of the ghostpad + * + * Create a new ghostpad without a target with the given direction. + * A target can be set on the ghostpad later with the + * #gst_ghost_pad_set_target() function. + * The created ghostpad will not have a padtemplate. + * Returns: a new #GstPad, or NULL in case of an error. + */ +GstPad * +gst_ghost_pad_new_notarget (const gchar * name, GstPadDirection dir) +{ + GstPad *ret; + ret = g_object_new (GST_TYPE_GHOST_PAD, "name", name, "direction", dir, NULL); + gst_pad_set_activatepush_function (ret, gst_ghost_pad_do_activate_push); + gst_pad_set_link_function (ret, gst_ghost_pad_do_link); + gst_pad_set_unlink_function (ret, gst_ghost_pad_do_unlink); +} +/** * gst_ghost_pad_new: * @name: the name of the new pad, or NULL to assign a default name. * @target: the pad to ghost. * + * Create a new ghostpad with @target as the target. The direction and + * padtemplate will be taken from the target pad. * Will ref the target. * Returns: a new #GstPad, or NULL in case of an error. @@ -691,16 +722,47 @@ GstPad *ret; g_return_val_if_fail (GST_IS_PAD (target), NULL); - g_return_val_if_fail (!GST_PAD_IS_LINKED (target), NULL); + g_return_val_if_fail (!gst_pad_is_linked (target), NULL); - ret = g_object_new (GST_TYPE_GHOST_PAD, - "name", name, - "direction", GST_PAD_DIRECTION (target), - "template", GST_PAD_PAD_TEMPLATE (target), "target", target, NULL); + if ((ret = gst_ghost_pad_new_notarget (name, GST_PAD_DIRECTION (target)))) { + g_object_set (G_OBJECT (ret), + "template", GST_PAD_PAD_TEMPLATE (target), NULL); + gst_ghost_pad_set_target (GST_GHOST_PAD (ret), target); - gst_pad_set_activatepush_function (ret, gst_ghost_pad_do_activate_push); - gst_pad_set_link_function (ret, gst_ghost_pad_do_link); - gst_pad_set_unlink_function (ret, gst_ghost_pad_do_unlink); + * gst_ghost_pad_get_target: + * @gpad: the #GstGhostpad + * Get the target pad of #gpad. Unref after usage. + * Returns: the target #GstPad, can be NULL if the ghostpad + * has no target set. Unref after usage. +gst_ghost_pad_get_target (GstGhostPad * gpad) + g_return_val_if_fail (GST_IS_GHOST_PAD (gpad), NULL); - return ret; + return gst_proxy_pad_get_target (GST_PAD_CAST (gpad)); + * gst_ghost_pad_set_target: + * @newtarget: the new pad target + * Set the new target of the ghostpad @gpad. Any existing target + * is unlinked. + * Returns: TRUE if the new target could be set, FALSE otherwise. +gboolean +gst_ghost_pad_set_target (GstGhostPad * gpad, GstPad * newtarget) + g_return_val_if_fail (GST_IS_GHOST_PAD (gpad), FALSE); + return gst_proxy_pad_set_target (GST_PAD_CAST (gpad), newtarget); Index: gstghostpad.h RCS file: /cvs/gstreamer/gstreamer/gst/gstghostpad.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- gstghostpad.h 8 Jun 2005 22:16:27 -0000 1.1 +++ gstghostpad.h 29 Jul 2005 19:22:28 -0000 1.2 @@ -31,23 +31,23 @@ G_BEGIN_DECLS #define GST_TYPE_GHOST_PAD (gst_ghost_pad_get_type ()) #define GST_IS_GHOST_PAD(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_GHOST_PAD)) #define GST_IS_GHOST_PAD_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_GHOST_PAD)) #define GST_GHOST_PAD(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_GHOST_PAD, GstGhostPad)) #define GST_GHOST_PAD_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_GHOST_PAD, GstGhostPadClass)) typedef struct _GstGhostPad GstGhostPad; typedef struct _GstGhostPadClass GstGhostPadClass; GType gst_ghost_pad_get_type (void); GstPad* gst_ghost_pad_new (const gchar *name, GstPad *target); +GstPad* gst_ghost_pad_new_notarget (const gchar *name, GstPadDirection dir); +GstPad* gst_ghost_pad_get_target (GstGhostPad *gpad); +gboolean gst_ghost_pad_set_target (GstGhostPad *gpad, GstPad *newtarget); G_END_DECLS #endif /* __GST_GHOST_PAD_H__ */ Index: ChangeLog RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.1316 retrieving revision 1.1317 diff -u -d -r1.1316 -r1.1317 --- ChangeLog 29 Jul 2005 19:19:29 -0000 1.1316 +++ ChangeLog 29 Jul 2005 19:22:27 -0000 1.1317 @@ -1,5 +1,33 @@ 2005-07-29 Wim Taymans <wi...@fl...> + * check/gst/gstghostpad.c: (GST_START_TEST), (gst_ghost_pad_suite): + Added test for removing an element with ghostpad from a bin. + Fixed test as current implementation does the right thing. + * gst/gstghostpad.c: (gst_proxy_pad_class_init), + (gst_proxy_pad_do_query_type), (gst_proxy_pad_do_event), + (gst_proxy_pad_do_query), (gst_proxy_pad_do_internal_link), + (gst_proxy_pad_do_bufferalloc), (gst_proxy_pad_do_activate), + (gst_proxy_pad_do_activatepull), (gst_proxy_pad_do_activatepush), + (gst_proxy_pad_do_chain), (gst_proxy_pad_do_getrange), + (gst_proxy_pad_do_checkgetrange), (gst_proxy_pad_do_getcaps), + (gst_proxy_pad_do_acceptcaps), (gst_proxy_pad_do_fixatecaps), + (gst_proxy_pad_do_setcaps), (gst_proxy_pad_set_target), + (gst_proxy_pad_get_target), (gst_proxy_pad_init), + (gst_proxy_pad_dispose), (gst_proxy_pad_finalize), + (gst_ghost_pad_class_init), (gst_ghost_pad_do_activate_push), + (gst_ghost_pad_do_link), (gst_ghost_pad_do_unlink), + (gst_ghost_pad_set_internal), (gst_ghost_pad_dispose), + (gst_ghost_pad_new_notarget), (gst_ghost_pad_new), + (gst_ghost_pad_get_target), (gst_ghost_pad_set_target): + * gst/gstghostpad.h: + Clean up ghostpads, remove properties for internal stuff. + Make threadsafe. + Fix refcounting. + Prepare for switching targets, not all use cases work yet. +2005-07-29 Wim Taymans <wi...@fl...> * docs/design/part-gstghostpad.txt: Small update. RCS file: /cvs/gstreamer/gstreamer/check/gst/gstghostpad.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- gstghostpad.c 28 Jul 2005 11:24:33 -0000 1.6 +++ gstghostpad.c 29 Jul 2005 19:22:28 -0000 1.7 @@ -70,6 +70,46 @@ GST_END_TEST; +/* test if removing a bin also cleans up the ghostpads +GST_START_TEST (test_remove2) + GstElement *b1, *b2, *src, *sink; + GstPad *srcpad, *sinkpad; + b1 = gst_element_factory_make ("pipeline", NULL); + b2 = gst_element_factory_make ("bin", NULL); + src = gst_element_factory_make ("fakesrc", NULL); + sink = gst_element_factory_make ("fakesink", NULL); + fail_unless (gst_bin_add (GST_BIN (b2), sink)); + fail_unless (gst_bin_add (GST_BIN (b1), src)); + fail_unless (gst_bin_add (GST_BIN (b1), b2)); + sinkpad = gst_element_get_pad (sink, "sink"); + gst_element_add_pad (b2, gst_ghost_pad_new ("sink", sinkpad)); + gst_object_unref (sinkpad); + srcpad = gst_element_get_pad (src, "src"); + /* get the ghostpad */ + sinkpad = gst_element_get_pad (b2, "sink"); + ret = gst_pad_link (srcpad, sinkpad); + fail_unless (ret == GST_PAD_LINK_OK); + gst_object_unref (srcpad); + /* now remove the sink from the bin */ + gst_bin_remove (GST_BIN (b2), sink); + /* pad is still linked to ghostpad */ + fail_if (!gst_pad_is_linked (srcpad)); +GST_END_TEST; /* test if linking fails over different bins using a pipeline * like this: @@ -186,23 +226,16 @@ /* unreffing the bin will unref all elements, which will unlink and unparent * all pads */ - /* FIXME: ghost pads need to drop their internal pad in the unlink function, - * but can't right now. So internal pads have a ref from their parent, and the - * internal pads' targets have refs from the internals. When we do the last - * unref on the ghost pads, these refs should go away. - */ assert_gstrefcount (fsrc, 2); /* gisrc */ assert_gstrefcount (gsink, 1); assert_gstrefcount (gsrc, 1); assert_gstrefcount (fsink, 2); /* gisink */ - assert_gstrefcount (gisrc, 2); /* gsink -- fixme drop ref in unlink */ + assert_gstrefcount (gisrc, 1); /* gsink */ assert_gstrefcount (isink, 2); /* gsink */ - assert_gstrefcount (gisink, 2); /* gsrc -- fixme drop ref in unlink */ + assert_gstrefcount (gisink, 1); /* gsrc */ assert_gstrefcount (isrc, 2); /* gsrc */ - /* while the fixme isn't fixed, check cleanup */ gst_object_unref (gsink); assert_gstrefcount (isink, 1); assert_gstrefcount (gisrc, 1); @@ -216,6 +249,11 @@ assert_gstrefcount (fsink, 2); /* gisrc */ gst_object_unref (gisink); assert_gstrefcount (fsink, 1); + gst_object_unref (fsrc); + gst_object_unref (isrc); + gst_object_unref (isink); + gst_object_unref (fsink); @@ -228,6 +266,7 @@ suite_add_tcase (s, tc_chain); tcase_add_test (tc_chain, test_remove1); + tcase_add_test (tc_chain, test_remove2); tcase_add_test (tc_chain, test_link); tcase_add_test (tc_chain, test_ghost_pads); |