mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

composition: Add objects to the pending IO list in a GSource

Browse source 
This way we make sure we do not manipulate our children from another
thread than the dedicated one.
This commit is contained in:
Thibault Saunier 2014-07-02 17:33:35 +02:00
parent bb7fa996b4
commit d8ca412cd9
2 changed files with 71 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
gnl/gnlcomposition.c
View file

@ -82,6 +82,12 @@ typedef struct
GstEvent *event; GstEvent *event;
} SeekData; } SeekData;
typedef struct
{
GnlComposition *comp;
GnlObject *object;
} ChildIOData;
struct _GnlCompositionPrivate struct _GnlCompositionPrivate
{ {
gboolean dispose_has_run; gboolean dispose_has_run;
@ -530,9 +536,18 @@ _add_initialize_stack_gsource (GnlComposition * comp)
MAIN_CONTEXT_UNLOCK (comp); MAIN_CONTEXT_UNLOCK (comp);
} }
static gboolean static void
remove_object_handler (GnlComposition * comp, GnlObject * object) _free_child_io_data (gpointer childio)
{ {
g_slice_free (ChildIOData, childio);
}
static void
_remove_object_func (ChildIOData * childio)
{
GnlComposition *comp = childio->comp;
GnlObject *object = childio->object;
GnlCompositionPrivate *priv = comp->priv; GnlCompositionPrivate *priv = comp->priv;
GnlCompositionEntry *entry; GnlCompositionEntry *entry;
GnlObject *in_pending_io; GnlObject *in_pending_io;
@ -548,14 +563,14 @@ remove_object_handler (GnlComposition * comp, GnlObject * object)
g_hash_table_remove (priv->pending_io, object); g_hash_table_remove (priv->pending_io, object);
COMP_OBJECTS_UNLOCK (comp); COMP_OBJECTS_UNLOCK (comp);
return TRUE; return;
} }
GST_ERROR_OBJECT (comp, "Object %" GST_PTR_FORMAT " is " GST_ERROR_OBJECT (comp, "Object %" GST_PTR_FORMAT " is "
" not in the composition", object); " not in the composition", object);
COMP_OBJECTS_UNLOCK (comp); COMP_OBJECTS_UNLOCK (comp);
return FALSE; return;
} }
if (in_pending_io) { if (in_pending_io) {
@ -563,19 +578,43 @@ remove_object_handler (GnlComposition * comp, GnlObject * object)
" for removal", object); " for removal", object);
COMP_OBJECTS_UNLOCK (comp); COMP_OBJECTS_UNLOCK (comp);
return FALSE; return;
} }
g_hash_table_add (priv->pending_io, object); g_hash_table_add (priv->pending_io, object);
COMP_OBJECTS_UNLOCK (comp); COMP_OBJECTS_UNLOCK (comp);
return TRUE; return;
}
static void
_add_remove_object_gsource (GnlComposition * comp, GnlObject * object)
{
ChildIOData *childio = g_slice_new0 (ChildIOData);
childio->comp = comp;
childio->object = object;
MAIN_CONTEXT_LOCK (comp);
g_main_context_invoke_full (comp->priv->mcontext, G_PRIORITY_HIGH,
(GSourceFunc) _remove_object_func, childio, _free_child_io_data);
MAIN_CONTEXT_UNLOCK (comp);
} }
static gboolean static gboolean
add_object_handler (GnlComposition * comp, GnlObject * object) remove_object_handler (GnlComposition * comp, GnlObject * object)
{ {
_add_remove_object_gsource (comp, object);
return TRUE;
}
static void
_add_object_func (ChildIOData * childio)
{
GnlComposition *comp = childio->comp;
GnlObject *object = childio->object;
GnlCompositionPrivate *priv = comp->priv; GnlCompositionPrivate *priv = comp->priv;
GnlCompositionEntry *entry; GnlCompositionEntry *entry;
GnlObject *in_pending_io; GnlObject *in_pending_io;
@ -589,7 +628,7 @@ add_object_handler (GnlComposition * comp, GnlObject * object)
" already in the composition", object); " already in the composition", object);
COMP_OBJECTS_UNLOCK (comp); COMP_OBJECTS_UNLOCK (comp);
return FALSE; return;
} }
if (in_pending_io) { if (in_pending_io) {
@ -597,13 +636,35 @@ add_object_handler (GnlComposition * comp, GnlObject * object)
" for addition", object); " for addition", object);
COMP_OBJECTS_UNLOCK (comp); COMP_OBJECTS_UNLOCK (comp);
return FALSE; return;
} }
g_hash_table_add (priv->pending_io, object); g_hash_table_add (priv->pending_io, object);
COMP_OBJECTS_UNLOCK (comp); COMP_OBJECTS_UNLOCK (comp);
return;
}
static void
_add_add_object_gsource (GnlComposition * comp, GnlObject * object)
{
ChildIOData *childio = g_slice_new0 (ChildIOData);
childio->comp = comp;
childio->object = object;
MAIN_CONTEXT_LOCK (comp);
g_main_context_invoke_full (comp->priv->mcontext, G_PRIORITY_HIGH,
(GSourceFunc) _add_object_func, childio, _free_child_io_data);
MAIN_CONTEXT_UNLOCK (comp);
}
static gboolean
add_object_handler (GnlComposition * comp, GnlObject * object)
{
_add_add_object_gsource (comp, object);
return TRUE; return TRUE;
} }

2
tests/check/gnl/gnlcomposition.c
View file

@ -187,7 +187,7 @@ GST_START_TEST (test_remove_invalid_object)
source2 = gst_element_factory_make ("gnlsource", "source2"); source2 = gst_element_factory_make ("gnlsource", "source2");
gnl_composition_add (composition, source1); gnl_composition_add (composition, source1);
fail_if (gnl_composition_remove (composition, source2)); gnl_composition_remove (composition, source2);
fail_unless (gnl_composition_remove (composition, source1)); fail_unless (gnl_composition_remove (composition, source1));
gst_object_unref (composition); gst_object_unref (composition);