mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-22 05:56:31 +00:00
tee: release pads in dispose
Make sure to release all request-pads in the dispose-method, in case of a shutdown-race, where a pad-alloc is about to happen. Fixes #604091
This commit is contained in:
parent
8bc67e5434
commit
494495eae6
1 changed files with 19 additions and 0 deletions
|
@ -114,6 +114,7 @@ static void gst_tee_set_property (GObject * object, guint prop_id,
|
||||||
const GValue * value, GParamSpec * pspec);
|
const GValue * value, GParamSpec * pspec);
|
||||||
static void gst_tee_get_property (GObject * object, guint prop_id,
|
static void gst_tee_get_property (GObject * object, guint prop_id,
|
||||||
GValue * value, GParamSpec * pspec);
|
GValue * value, GParamSpec * pspec);
|
||||||
|
static void gst_tee_dispose (GObject * object);
|
||||||
|
|
||||||
static GstFlowReturn gst_tee_chain (GstPad * pad, GstBuffer * buffer);
|
static GstFlowReturn gst_tee_chain (GstPad * pad, GstBuffer * buffer);
|
||||||
static GstFlowReturn gst_tee_chain_list (GstPad * pad, GstBufferList * list);
|
static GstFlowReturn gst_tee_chain_list (GstPad * pad, GstBufferList * list);
|
||||||
|
@ -145,6 +146,23 @@ gst_tee_base_init (gpointer g_class)
|
||||||
push_data = g_quark_from_static_string ("tee-push-data");
|
push_data = g_quark_from_static_string ("tee-push-data");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
gst_tee_dispose (GObject * object)
|
||||||
|
{
|
||||||
|
GList *item;
|
||||||
|
|
||||||
|
restart:
|
||||||
|
for (item = GST_ELEMENT_PADS (object); item; item = g_list_next (item)) {
|
||||||
|
GstPad *pad = GST_PAD (item->data);
|
||||||
|
if (GST_PAD_IS_SRC (pad)) {
|
||||||
|
gst_element_release_request_pad (GST_ELEMENT (object), pad);
|
||||||
|
goto restart;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
G_OBJECT_CLASS (parent_class)->dispose (object);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
gst_tee_finalize (GObject * object)
|
gst_tee_finalize (GObject * object)
|
||||||
{
|
{
|
||||||
|
@ -171,6 +189,7 @@ gst_tee_class_init (GstTeeClass * klass)
|
||||||
gobject_class->finalize = gst_tee_finalize;
|
gobject_class->finalize = gst_tee_finalize;
|
||||||
gobject_class->set_property = gst_tee_set_property;
|
gobject_class->set_property = gst_tee_set_property;
|
||||||
gobject_class->get_property = gst_tee_get_property;
|
gobject_class->get_property = gst_tee_get_property;
|
||||||
|
gobject_class->dispose = gst_tee_dispose;
|
||||||
|
|
||||||
g_object_class_install_property (gobject_class, PROP_NUM_SRC_PADS,
|
g_object_class_install_property (gobject_class, PROP_NUM_SRC_PADS,
|
||||||
g_param_spec_int ("num-src-pads", "Num Src Pads",
|
g_param_spec_int ("num-src-pads", "Num Src Pads",
|
||||||
|
|
Loading…
Reference in a new issue