From: Thibault Saunier <tsaunier@gnome.org>
Date: Wed, 30 Nov 2016 12:53:38 +0000 (-0300)
Subject: nlecomposition: Deactivate current stack in PAUSED_READY state
X-Git-Tag: 1.19.3~493^2~882
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=66e13d43b912f9f3fc7d151dd8dc6196506e69b4;p=platform%2Fupstream%2Fgstreamer.git

nlecomposition: Deactivate current stack in PAUSED_READY state

To avoid a race when tearing down the composition (PAUSED_TO_READY),
we should make sure to tear down the current stack and let the GstBin
class handle the remaining thing to do during the change state.

We should still ignore any error happening when tearing down the
bin state just in case.

https://bugzilla.gnome.org/show_bug.cgi?id=775051
---

diff --git a/plugins/nle/nlecomposition.c b/plugins/nle/nlecomposition.c
index 67027b9..3b0e9ad 100644
--- a/plugins/nle/nlecomposition.c
+++ b/plugins/nle/nlecomposition.c
@@ -2375,27 +2375,10 @@ _update_pipeline_func (NleComposition * comp, UpdateCompositionData * ucompo)
   _post_start_composition_update_done (comp, ucompo->seqnum, ucompo->reason);
 }
 
-static void
-_set_all_children_state (NleComposition * comp, GstState state)
-{
-  GList *tmp;
-
-  GST_DEBUG_OBJECT (comp, "Setting all children state to %s",
-      gst_element_state_get_name (state));
-
-  comp->priv->tearing_down_stack = TRUE;
-  gst_element_set_state (comp->priv->current_bin, state);
-  for (tmp = comp->priv->objects_start; tmp; tmp = tmp->next)
-    gst_element_set_state (tmp->data, state);
-
-  for (tmp = comp->priv->expandables; tmp; tmp = tmp->next)
-    gst_element_set_state (tmp->data, state);
-  comp->priv->tearing_down_stack = FALSE;
-}
-
 static GstStateChangeReturn
 nle_composition_change_state (GstElement * element, GstStateChange transition)
 {
+  GstStateChangeReturn res;
   NleComposition *comp = (NleComposition *) element;
 
   GST_DEBUG_OBJECT (comp, "%s => %s",
@@ -2419,23 +2402,39 @@ nle_composition_change_state (GstElement * element, GstStateChange transition)
 
       _remove_update_actions (comp);
       _remove_seek_actions (comp);
-      _set_all_children_state (comp, GST_STATE_READY);
-      nle_composition_reset (comp);
-
-      _start_task (comp);
+      _deactivate_stack (comp, TRUE);
+      comp->priv->tearing_down_stack = TRUE;
       break;
     case GST_STATE_CHANGE_READY_TO_NULL:
       _stop_task (comp);
 
       _remove_update_actions (comp);
       _remove_seek_actions (comp);
-      _set_all_children_state (comp, GST_STATE_NULL);
+      comp->priv->tearing_down_stack = TRUE;
       break;
     default:
       break;
   }
 
-  return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+  res = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
+      comp->priv->tearing_down_stack = FALSE;
+      nle_composition_reset (comp);
+
+      /* In READY we are still able to process actions. */
+      _start_task (comp);
+      break;
+    case GST_STATE_CHANGE_READY_TO_NULL:
+      gst_element_set_state (comp->priv->current_bin, GST_STATE_NULL);
+      comp->priv->tearing_down_stack = FALSE;
+      break;
+    default:
+      break;
+  }
+
+  return res;
 }
 
 static gint