mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-20 16:51:10 +00:00
Code Issues 1 Projects Releases Wiki Activity

nlecomposition: Fix several leaks

Browse source 
* In the action closure invokation we were alway leaking the composition.
* gst_bin_add will actually take an extra ref since we already  gst_object_ref_sink so we
own the object, other call to that method will increase the refcount which means we do
not need to pass an extra ref to the bin.
* We want to ref_sink right when the object is added to the composition, making things
cleaner and simpler to follow in the tests.
This commit is contained in:
Thibault Saunier 2014-09-19 12:55:51 +02:00
parent 3e79e28213
commit 50cf1fb5fe
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ges/nle/nlecomposition.c
View file

@ -367,6 +367,7 @@ _execute_actions (NleComposition * comp)
GST_INFO_OBJECT (comp, "Invoking %p:%s", GST_INFO_OBJECT (comp, "Invoking %p:%s",
lact->data, GST_DEBUG_FUNCPTR_NAME ((ACTION_CALLBACK (lact->data)))); lact->data, GST_DEBUG_FUNCPTR_NAME ((ACTION_CALLBACK (lact->data))));
g_closure_invoke (lact->data, NULL, 1, params, NULL); g_closure_invoke (lact->data, NULL, 1, params, NULL);
g_value_unset (&params[0]);
} else { } else {
ACTIONS_UNLOCK (comp); ACTIONS_UNLOCK (comp);
} }
@ -2500,7 +2501,7 @@ _relink_single_node (NleComposition * comp, GNode * node,
srcpad = NLE_OBJECT_SRC (newobj); srcpad = NLE_OBJECT_SRC (newobj);
gst_bin_add (GST_BIN (comp->priv->current_bin), gst_object_ref (newobj)); gst_bin_add (GST_BIN (comp->priv->current_bin), GST_ELEMENT (newobj));
gst_element_sync_state_with_parent (GST_ELEMENT_CAST (newobj)); gst_element_sync_state_with_parent (GST_ELEMENT_CAST (newobj));
translated_seek = nle_object_translate_incoming_seek (newobj, toplevel_seek); translated_seek = nle_object_translate_incoming_seek (newobj, toplevel_seek);
@ -2866,6 +2867,7 @@ nle_composition_add_object (GstBin * bin, GstElement * element)
g_return_val_if_fail (NLE_IS_OBJECT (element), FALSE); g_return_val_if_fail (NLE_IS_OBJECT (element), FALSE);
object = NLE_OBJECT (element); object = NLE_OBJECT (element);
gst_object_ref_sink (object);
object->in_composition = TRUE; object->in_composition = TRUE;
_add_add_object_action (comp, object); _add_add_object_action (comp, object);
@ -2884,8 +2886,6 @@ _nle_composition_add_object (NleComposition * comp, NleObject * object)
GST_TIME_ARGS (NLE_OBJECT_START (object)), GST_TIME_ARGS (NLE_OBJECT_START (object)),
GST_TIME_ARGS (NLE_OBJECT_STOP (object))); GST_TIME_ARGS (NLE_OBJECT_STOP (object)));
g_object_ref_sink (object);
if ((NLE_OBJECT_IS_EXPANDABLE (object)) && if ((NLE_OBJECT_IS_EXPANDABLE (object)) &&
g_list_find (priv->expandables, object)) { g_list_find (priv->expandables, object)) {
GST_WARNING_OBJECT (comp, GST_WARNING_OBJECT (comp,