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

composition: Initialize the first stack async

Browse source
This commit is contained in:
Thibault Saunier 2014-06-30 15:12:38 +02:00
parent 3c958af13c
commit 33aea7c5f4
1 changed files with 38 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
gnl/gnlcomposition.c
View file

@ -146,6 +146,7 @@ struct _GnlCompositionPrivate
gboolean reset_time; gboolean reset_time;
gboolean running; gboolean running;
gboolean initialized;
GstState deactivated_elements_state; GstState deactivated_elements_state;
}; };
@ -201,6 +202,10 @@ compare_relink_single_node (GnlComposition * comp, GNode * node,
GNode * oldstack); GNode * oldstack);
static gboolean update_pipeline_func (GnlComposition * comp); static gboolean update_pipeline_func (GnlComposition * comp);
static gboolean commit_pipeline_func (GnlComposition * comp); static gboolean commit_pipeline_func (GnlComposition * comp);
static gboolean lock_child_state (GValue * item, GValue * ret,
gpointer udata G_GNUC_UNUSED);
static gboolean
set_child_caps (GValue * item, GValue * ret G_GNUC_UNUSED, GnlObject * comp);
/* COMP_REAL_START: actual position to start current playback at. */ /* COMP_REAL_START: actual position to start current playback at. */
@ -399,6 +404,35 @@ _add_commit_gsource (GnlComposition * comp)
MAIN_CONTEXT_UNLOCK (comp); MAIN_CONTEXT_UNLOCK (comp);
} }
static gboolean
_initialize_stack_func (GnlComposition * comp)
{
GnlCompositionPrivate *priv = comp->priv;
/* set ghostpad target */
COMP_OBJECTS_LOCK (comp);
if (!(update_pipeline (comp, COMP_REAL_START (comp), TRUE, TRUE))) {
COMP_OBJECTS_UNLOCK (comp);
GST_FIXME_OBJECT (comp, "PLEASE signal state change failure ASYNC");
return G_SOURCE_REMOVE;
}
COMP_OBJECTS_UNLOCK (comp);
priv->initialized = TRUE;
return G_SOURCE_REMOVE;
}
static void
_add_initialize_stack_gsource (GnlComposition * comp)
{
MAIN_CONTEXT_LOCK (comp);
g_main_context_invoke (comp->priv->mcontext,
(GSourceFunc) _initialize_stack_func, comp);
MAIN_CONTEXT_UNLOCK (comp);
}
static void static void
gnl_composition_class_init (GnlCompositionClass * klass) gnl_composition_class_init (GnlCompositionClass * klass)
{ {
@ -767,7 +801,7 @@ gnl_composition_reset (GnlComposition * comp)
COMP_FLUSHING_UNLOCK (comp); COMP_FLUSHING_UNLOCK (comp);
priv->reset_time = FALSE; priv->reset_time = FALSE;
priv->initialized = FALSE;
priv->send_stream_start = TRUE; priv->send_stream_start = TRUE;
GST_DEBUG_OBJECT (comp, "Composition now resetted"); GST_DEBUG_OBJECT (comp, "Composition now resetted");
@ -1892,7 +1926,7 @@ commit_pipeline_func (GnlComposition * comp)
priv->objects_stop = g_list_sort priv->objects_stop = g_list_sort
(priv->objects_stop, (GCompareFunc) objects_stop_compare); (priv->objects_stop, (GCompareFunc) objects_stop_compare);
if (GST_STATE (comp) < GST_STATE_PAUSED) { if (priv->initialized == FALSE) {
update_start_stop_duration (comp); update_start_stop_duration (comp);
} else { } else {
/* And update the pipeline at current position if needed */ /* And update the pipeline at current position if needed */
@ -1953,6 +1987,7 @@ update_pipeline_func (GnlComposition * comp)
static GstStateChangeReturn static GstStateChangeReturn
gnl_composition_change_state (GstElement * element, GstStateChange transition) gnl_composition_change_state (GstElement * element, GstStateChange transition)
{ {
GstIterator *children;
GnlComposition *comp = (GnlComposition *) element; GnlComposition *comp = (GnlComposition *) element;
GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS; GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS;
@ -1962,9 +1997,6 @@ gnl_composition_change_state (GstElement * element, GstStateChange transition)
switch (transition) { switch (transition) {
case GST_STATE_CHANGE_READY_TO_PAUSED: case GST_STATE_CHANGE_READY_TO_PAUSED:
{
GstIterator *children;
gnl_composition_reset (comp); gnl_composition_reset (comp);
/* state-lock all elements */ /* state-lock all elements */
@ -1992,17 +2024,7 @@ gnl_composition_change_state (GstElement * element, GstStateChange transition)
gst_iterator_free (children); gst_iterator_free (children);
} }
_add_initialize_stack_gsource (comp);
/* set ghostpad target */
COMP_OBJECTS_LOCK (comp);
if (!(update_pipeline (comp, COMP_REAL_START (comp), TRUE, TRUE))) {
ret = GST_STATE_CHANGE_FAILURE;
COMP_OBJECTS_UNLOCK (comp);
goto beach;
}
COMP_OBJECTS_UNLOCK (comp);
}
break; break;
case GST_STATE_CHANGE_PAUSED_TO_READY: case GST_STATE_CHANGE_PAUSED_TO_READY:
/* Fallthrough */ /* Fallthrough */
@ -2027,7 +2049,6 @@ gnl_composition_change_state (GstElement * element, GstStateChange transition)
break; break;
} }
beach:
return ret; return ret;
} }