mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-03 05:59:10 +00:00
Code Issues 1 Projects Releases Wiki Activity

aggregator: Avoid destroying sources we do not own

Browse source 
+ Unref the maincontext in a new dispose function
+ Make sure to remove all sources on dispose

https://bugzilla.gnome.org/show_bug.cgi?id=732445
This commit is contained in:
Thibault Saunier 2014-06-30 12:22:07 +02:00 committed by Tim-Philipp Müller
parent e947a5d2a1
commit 481476c439
2 changed files with 33 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
libs/gst/base/gstaggregator.c
View file

@ -163,6 +163,7 @@ struct _GstAggregatorPrivate
* we can not add any source, avoiding: * we can not add any source, avoiding:
* "g_source_attach: assertion '!SOURCE_DESTROYED (source)' failed" */ * "g_source_attach: assertion '!SOURCE_DESTROYED (source)' failed" */
GMutex mcontext_lock; GMutex mcontext_lock;
GList *gsources;
gboolean send_stream_start; gboolean send_stream_start;
gboolean send_segment; gboolean send_segment;
@ -375,17 +376,22 @@ _push_eos (GstAggregator * self)
gst_pad_push_event (self->srcpad, gst_event_new_eos ()); gst_pad_push_event (self->srcpad, gst_event_new_eos ());
} }
static void
_destroy_gsource (GSource * source)
{
g_source_destroy (source);
g_source_unref (source);
}
static void static void
_remove_all_sources (GstAggregator * self) _remove_all_sources (GstAggregator * self)
{ {
GSource *source; GstAggregatorPrivate *priv = self->priv;
MAIN_CONTEXT_LOCK (self); MAIN_CONTEXT_LOCK (self);
while ((source = g_list_free_full (priv->gsources, (GDestroyNotify) _destroy_gsource);
g_main_context_find_source_by_user_data (self->priv->mcontext, priv->gsources = NULL;
self))) {
g_source_destroy (source);
}
MAIN_CONTEXT_UNLOCK (self); MAIN_CONTEXT_UNLOCK (self);
} }
@ -488,9 +494,14 @@ _start_srcpad_task (GstAggregator * self)
static inline void static inline void
_add_aggregate_gsource (GstAggregator * self) _add_aggregate_gsource (GstAggregator * self)
{ {
GSource *source;
GstAggregatorPrivate *priv = self->priv;
MAIN_CONTEXT_LOCK (self); MAIN_CONTEXT_LOCK (self);
g_main_context_invoke (self->priv->mcontext, (GSourceFunc) aggregate_func, source = g_idle_source_new ();
self); g_source_set_callback (source, (GSourceFunc) aggregate_func, self, NULL);
priv->gsources = g_list_prepend (priv->gsources, source);
g_source_attach (source, priv->mcontext);
MAIN_CONTEXT_UNLOCK (self); MAIN_CONTEXT_UNLOCK (self);
} }
@ -1017,6 +1028,17 @@ gst_aggregator_finalize (GObject * object)
G_OBJECT_CLASS (aggregator_parent_class)->finalize (object); G_OBJECT_CLASS (aggregator_parent_class)->finalize (object);
} }
static void
gst_aggregator_dispose (GObject * object)
{
GstAggregator *self = (GstAggregator *) object;
G_OBJECT_CLASS (aggregator_parent_class)->dispose (object);
g_main_context_unref (self->priv->mcontext);
_remove_all_sources (self);
}
/* GObject vmethods implementations */ /* GObject vmethods implementations */
static void static void
gst_aggregator_class_init (GstAggregatorClass * klass) gst_aggregator_class_init (GstAggregatorClass * klass)
@ -1045,6 +1067,7 @@ gst_aggregator_class_init (GstAggregatorClass * klass)
gstelement_class->change_state = GST_DEBUG_FUNCPTR (_change_state); gstelement_class->change_state = GST_DEBUG_FUNCPTR (_change_state);
gobject_class->finalize = gst_aggregator_finalize; gobject_class->finalize = gst_aggregator_finalize;
gobject_class->dispose = gst_aggregator_dispose;
} }
static void static void

4
tests/check/libs/aggregator.c
View file

@ -106,7 +106,7 @@ gst_test_aggregator_aggregate (GstAggregator * aggregator)
gst_iterator_free (iter); gst_iterator_free (iter);
if (all_eos == TRUE) { if (all_eos == TRUE) {
GST_ERROR_OBJECT (testagg, "no data available, must be EOS"); GST_INFO_OBJECT (testagg, "no data available, must be EOS");
gst_pad_push_event (aggregator->srcpad, gst_event_new_eos ()); gst_pad_push_event (aggregator->srcpad, gst_event_new_eos ());
return GST_FLOW_EOS; return GST_FLOW_EOS;
} }
@ -257,7 +257,7 @@ push_event (gpointer user_data)
{ {
ChainData *chain_data = (ChainData *) user_data; ChainData *chain_data = (ChainData *) user_data;
GST_ERROR_OBJECT (chain_data->srcpad, "Pushing event: %" GST_INFO_OBJECT (chain_data->srcpad, "Pushing event: %"
GST_PTR_FORMAT, chain_data->event); GST_PTR_FORMAT, chain_data->event);
fail_unless (gst_pad_push_event (chain_data->srcpad, fail_unless (gst_pad_push_event (chain_data->srcpad,
chain_data->event) == TRUE); chain_data->event) == TRUE);