From b5905111460540975996e0532f6c4ed092ad15c9 Mon Sep 17 00:00:00 2001
From: Thibault Saunier <tsaunier@igalia.com>
Date: Tue, 5 Oct 2021 18:50:21 -0300
Subject: [PATCH] validate:scenario: Allow waiting signal searching for element
 factory

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1064>
---
 .../gst/validate/gst-validate-scenario.c         | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/subprojects/gst-devtools/validate/gst/validate/gst-validate-scenario.c b/subprojects/gst-devtools/validate/gst/validate/gst-validate-scenario.c
index 414355703a..3742057fda 100644
--- a/subprojects/gst-devtools/validate/gst/validate/gst-validate-scenario.c
+++ b/subprojects/gst-devtools/validate/gst/validate/gst-validate-scenario.c
@@ -148,6 +148,8 @@ static GstValidateExecuteActionReturn
 _fill_action (GstValidateScenario * scenario, GstValidateAction * action,
     GstStructure * structure, gboolean add_to_lists);
 static gboolean _action_set_done (GstValidateAction * action);
+static GList *_find_elements_defined_in_action (GstValidateScenario * scenario,
+    GstValidateAction * action);
 
 /* GstValidateSinkInformation tracks information for all sinks in the pipeline */
 typedef struct
@@ -2858,13 +2860,15 @@ _execute_wait_for_signal (GstValidateScenario * scenario,
   GstValidateScenarioPrivate *priv = scenario->priv;
   const gchar *signal_name = gst_structure_get_string
       (action->structure, "signal-name");
+  GList *targets = NULL;
   GstElement *target;
   GstStructure *data;
   GstValidateExecuteActionReturn res = GST_VALIDATE_EXECUTE_ACTION_OK;
   DECLARE_AND_GET_PIPELINE (scenario, action);
 
   REPORT_UNLESS (signal_name, err, "No signal-name given for wait action");
-  REPORT_UNLESS ((target = _get_target_element (scenario, action)), err,
+  targets = _find_elements_defined_in_action (scenario, action);
+  REPORT_UNLESS ((g_list_length (targets) == 1), err,
       "Could not find target element.");
 
   gst_validate_printf (action, "Waiting for '%s' signal\n", signal_name);
@@ -2874,6 +2878,7 @@ _execute_wait_for_signal (GstValidateScenario * scenario,
     priv->execute_actions_source_id = 0;
   }
 
+  target = targets->data;
   data =
       gst_structure_new ("a", "action", GST_TYPE_VALIDATE_ACTION, action,
       "target", G_TYPE_POINTER, target, NULL);
@@ -2892,12 +2897,14 @@ _execute_wait_for_signal (GstValidateScenario * scenario,
   SCENARIO_UNLOCK (scenario);
 
   gst_object_unref (pipeline);
+  g_list_free (targets);
 
 
   return non_blocking ? GST_VALIDATE_EXECUTE_ACTION_NON_BLOCKING :
       GST_VALIDATE_EXECUTE_ACTION_ASYNC;
 
 err:
+  g_list_free_full (targets, gst_object_unref);
   gst_object_unref (pipeline);
   return res;
 }
@@ -6683,6 +6690,13 @@ register_action_types (void)
           .mandatory = FALSE,
           .types = "string"
         },
+        {
+          .name = "target-element-factory-name",
+          .description = "The name factory for which to wait @signal-name on",
+          .mandatory = FALSE,
+          .types = "string",
+          NULL
+        },
         {
           .name = "signal-name",
           .description = "The name of the signal to wait for on @target-element-name."