mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-21 07:46:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

aggregator: add dispose/finalize functions

Browse source 
Add functions to be able to cleanup the mutex/cond and pending buffers
on the aggregator and on its pad
This commit is contained in:
Thiago Santos 2014-06-28 09:31:55 -03:00
parent ea1ee4e3d0
commit 5ce02fa5f9
1 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
gst-libs/gst/base/gstaggregator.c
View file

@ -1006,10 +1006,21 @@ _sink_query (GstAggregator * self, GstAggregatorPad * aggpad, GstQuery * query)
return gst_pad_query_default (pad, GST_OBJECT (self), query); return gst_pad_query_default (pad, GST_OBJECT (self), query);
} }
static void
gst_aggregator_finalize (GObject * object)
{
GstAggregator *self = (GstAggregator *) object;
g_mutex_clear (&self->priv->mcontext_lock);
G_OBJECT_CLASS (aggregator_parent_class)->finalize (object);
}
/* GObject vmethods implementations */ /* GObject vmethods implementations */
static void static void
gst_aggregator_class_init (GstAggregatorClass * klass) gst_aggregator_class_init (GstAggregatorClass * klass)
{ {
GObjectClass *gobject_class = (GObjectClass *) klass;
GstElementClass *gstelement_class = (GstElementClass *) klass; GstElementClass *gstelement_class = (GstElementClass *) klass;
aggregator_parent_class = g_type_class_peek_parent (klass); aggregator_parent_class = g_type_class_peek_parent (klass);
@ -1031,6 +1042,8 @@ gst_aggregator_class_init (GstAggregatorClass * klass)
gstelement_class->request_new_pad = GST_DEBUG_FUNCPTR (_request_new_pad); gstelement_class->request_new_pad = GST_DEBUG_FUNCPTR (_request_new_pad);
gstelement_class->release_pad = GST_DEBUG_FUNCPTR (_release_pad); gstelement_class->release_pad = GST_DEBUG_FUNCPTR (_release_pad);
gstelement_class->change_state = GST_DEBUG_FUNCPTR (_change_state); gstelement_class->change_state = GST_DEBUG_FUNCPTR (_change_state);
gobject_class->finalize = gst_aggregator_finalize;
} }
static void static void
@ -1066,6 +1079,8 @@ gst_aggregator_init (GstAggregator * self, GstAggregatorClass * klass)
GST_DEBUG_FUNCPTR ((GstPadActivateModeFunction) src_activate_mode)); GST_DEBUG_FUNCPTR ((GstPadActivateModeFunction) src_activate_mode));
gst_element_add_pad (GST_ELEMENT (self), self->srcpad); gst_element_add_pad (GST_ELEMENT (self), self->srcpad);
g_mutex_init (&self->priv->mcontext_lock);
} }
/* we can't use G_DEFINE_ABSTRACT_TYPE because we need the klass in the _init /* we can't use G_DEFINE_ABSTRACT_TYPE because we need the klass in the _init
@ -1196,6 +1211,7 @@ pad_activate_mode_func (GstPad * pad,
/*********************************** /***********************************
* GstAggregatorPad implementation * * GstAggregatorPad implementation *
************************************/ ************************************/
static GstPadClass *aggregator_pad_parent_class = NULL;
G_DEFINE_TYPE (GstAggregatorPad, gst_aggregator_pad, GST_TYPE_PAD); G_DEFINE_TYPE (GstAggregatorPad, gst_aggregator_pad, GST_TYPE_PAD);
static void static void
@ -1213,14 +1229,41 @@ _pad_constructed (GObject * object)
GST_DEBUG_FUNCPTR ((GstPadActivateModeFunction) pad_activate_mode_func)); GST_DEBUG_FUNCPTR ((GstPadActivateModeFunction) pad_activate_mode_func));
} }
static void
gst_aggregator_pad_finalize (GObject * object)
{
GstAggregatorPad *pad = (GstAggregatorPad *) object;
g_mutex_clear (&pad->priv->event_lock);
g_cond_clear (&pad->priv->event_cond);
G_OBJECT_CLASS (aggregator_pad_parent_class)->finalize (object);
}
static void
gst_aggregator_pad_dispose (GObject * object)
{
GstAggregatorPad *pad = (GstAggregatorPad *) object;
GstBuffer *buf;
buf = gst_aggregator_pad_steal_buffer (pad);
if (buf)
gst_buffer_unref (buf);
G_OBJECT_CLASS (aggregator_pad_parent_class)->dispose (object);
}
static void static void
gst_aggregator_pad_class_init (GstAggregatorPadClass * klass) gst_aggregator_pad_class_init (GstAggregatorPadClass * klass)
{ {
GObjectClass *gobject_class = (GObjectClass *) klass; GObjectClass *gobject_class = (GObjectClass *) klass;
aggregator_pad_parent_class = g_type_class_peek_parent (klass);
g_type_class_add_private (klass, sizeof (GstAggregatorPadPrivate)); g_type_class_add_private (klass, sizeof (GstAggregatorPadPrivate));
gobject_class->constructed = GST_DEBUG_FUNCPTR (_pad_constructed); gobject_class->constructed = GST_DEBUG_FUNCPTR (_pad_constructed);
gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_aggregator_pad_finalize);
gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_aggregator_pad_dispose);
} }
static void static void