From d7b5d5730521bc5144b509ae28149ff0d2afeee4 Mon Sep 17 00:00:00 2001
From: Thibault Saunier <tsaunier@gnome.org>
Date: Thu, 11 Dec 2014 12:08:13 +0100
Subject: [PATCH] validate:scenario: Avoid waiting for 50ms between actions

We should be able to execute the next action as soon as the previous
one is fully completed, make sure the code tries to do that and does
not artificially add some waiting time.

And make sure if the gst_validate_action_set_done is called from outside
our execution thread, we do not try to execute anything

https://bugzilla.gnome.org/show_bug.cgi?id=743994
---
 validate/gst/validate/gst-validate-scenario.c | 33 ++++++++++++++++---
 validate/gst/validate/gst-validate-scenario.h |  3 +-
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/validate/gst/validate/gst-validate-scenario.c b/validate/gst/validate/gst-validate-scenario.c
index b03c9d62cf2..d5d4723e957 100644
--- a/validate/gst/validate/gst-validate-scenario.c
+++ b/validate/gst/validate/gst-validate-scenario.c
@@ -84,6 +84,8 @@ static GList *action_types = NULL;
 static void gst_validate_scenario_dispose (GObject * object);
 static void gst_validate_scenario_finalize (GObject * object);
 
+static GPrivate main_thread_priv;
+
 struct _GstValidateScenarioPrivate
 {
   GstValidateRunner *runner;
@@ -154,13 +156,14 @@ G_DEFINE_TYPE_WITH_CODE (GstValidateScenario, gst_validate_scenario,
 GType _gst_validate_action_type;
 
 GST_DEFINE_MINI_OBJECT_TYPE (GstValidateAction, gst_validate_action);
-static GstValidateAction *gst_validate_action_new (void);
+static GstValidateAction *gst_validate_action_new (GstValidateScenario *
+    scenario);
 static gboolean get_position (GstValidateScenario * scenario);
 
 static GstValidateAction *
 _action_copy (GstValidateAction * act)
 {
-  GstValidateAction *copy = gst_validate_action_new ();
+  GstValidateAction *copy = gst_validate_action_new (act->scenario);
 
   if (act->structure) {
     copy->structure = gst_structure_copy (act->structure);
@@ -191,13 +194,18 @@ gst_validate_action_init (GstValidateAction * action)
 }
 
 static GstValidateAction *
-gst_validate_action_new (void)
+gst_validate_action_new (GstValidateScenario * scenario)
 {
   GstValidateAction *action = g_slice_new0 (GstValidateAction);
 
   gst_validate_action_init (action);
   action->playback_time = GST_CLOCK_TIME_NONE;
 
+  action->scenario = scenario;
+  if (scenario)
+    g_object_add_weak_pointer (G_OBJECT (scenario),
+        ((gpointer *) & action->scenario));
+
   return action;
 }
 
@@ -1012,6 +1020,10 @@ get_position (GstValidateScenario * scenario)
       g_signal_emit (scenario, scenario_signals[DONE], 0);
 
     g_list_free (tmp);
+
+    /* Recurse to the next action if it is possible
+     * to execute right away */
+    return get_position (scenario);
   }
 
   return TRUE;
@@ -1442,7 +1454,7 @@ _load_scenario_file (GstValidateScenario * scenario,
       }
     }
 
-    action = gst_validate_action_new ();
+    action = gst_validate_action_new (scenario);
     action->type = type;
     action->repeat = -1;
     if (gst_structure_get_double (structure, "playback-time", &playback_time) ||
@@ -1997,6 +2009,17 @@ void
 gst_validate_action_set_done (GstValidateAction * action)
 {
   action->state = GST_VALIDATE_EXECUTE_ACTION_OK;
+
+  if (action->scenario) {
+    if (GPOINTER_TO_INT (g_private_get (&main_thread_priv))) {
+      GST_DEBUG_OBJECT (action->scenario, "Right thread, executing next?");
+      get_position (action->scenario);
+    } else {
+      GST_DEBUG_OBJECT (action->scenario, "Not doing anything until outside the"
+          " 'main' thread");
+
+    }
+  }
 }
 
 /**
@@ -2124,6 +2147,8 @@ init_scenarios (void)
   _gst_validate_action_type = gst_validate_action_get_type ();
   _gst_validate_action_type_type = gst_validate_action_type_get_type ();
 
+  g_private_set (&main_thread_priv, GUINT_TO_POINTER (TRUE));
+
   /*  *INDENT-OFF* */
   REGISTER_ACTION_TYPE ("description", NULL,
       ((GstValidateActionParameter [])  {
diff --git a/validate/gst/validate/gst-validate-scenario.h b/validate/gst/validate/gst-validate-scenario.h
index 55e4accbc9e..dd6829814b0 100644
--- a/validate/gst/validate/gst-validate-scenario.h
+++ b/validate/gst/validate/gst-validate-scenario.h
@@ -90,8 +90,9 @@ struct _GstValidateAction
   gint repeat;
   GstClockTime playback_time;
   GstValidateExecuteActionReturn state; /* Actually ActionState */
+  GstValidateScenario *scenario;
 
-  gpointer _gst_reserved[GST_PADDING_LARGE - sizeof (gint)];
+  gpointer _gst_reserved[GST_PADDING_LARGE - sizeof (gint) - 1];
 };
 
 void gst_validate_action_set_done (GstValidateAction *action);