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

validate: Add a parameter to force waiting on the test clock

Browse source 
This allows to wait for a new buffer to reach the sink without
actually cranking that buffer, allowing to quite the test without
waiting for EOS in a 100% reproducible way

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-devtools/-/merge_requests/201>
This commit is contained in:
Thibault Saunier 2020-05-29 18:11:54 -04:00
parent 774a4a8704
commit 6a305b1e23
2 changed files with 27 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
validate/gst/validate/gst-validate-scenario.c
View file

@ -2588,10 +2588,17 @@ _execute_wait_for_message (GstValidateScenario * scenario,
static GstValidateExecuteActionReturn
_execute_wait (GstValidateScenario * scenario, GstValidateAction * action)
{
gboolean on_clock = FALSE;
gst_structure_get_boolean (action->structure, "on-clock", &on_clock);
if (gst_structure_has_field (action->structure, "signal-name")) {
return _execute_wait_for_signal (scenario, action);
} else if (gst_structure_has_field (action->structure, "message-type")) {
return _execute_wait_for_message (scenario, action);
} else if (on_clock) {
gst_test_clock_wait_for_next_pending_id (scenario->priv->clock, NULL);
return GST_VALIDATE_EXECUTE_ACTION_OK;
} else {
return _execute_timed_wait (scenario, action);
}
@ -3675,6 +3682,7 @@ gst_validate_scenario_load_structures (GstValidateScenario * scenario,
GstValidateAction *action;
GstValidateActionType *action_type;
const gchar *type;
gboolean on_clock = FALSE;
GstStructure *structure = (GstStructure *) tmp->data;
type = gst_structure_get_name (structure);
@ -3714,7 +3722,8 @@ gst_validate_scenario_load_structures (GstValidateScenario * scenario,
goto failed;
}
if (!g_strcmp0 (type, "crank-clock") && !priv->clock)
gst_structure_get_boolean (structure, "on-clock", &on_clock);
if ((!g_strcmp0 (type, "crank-clock") || on_clock) && !priv->clock)
priv->clock = GST_TEST_CLOCK (gst_test_clock_new ());
if (action_type->parameters) {
@ -5870,6 +5879,14 @@ register_action_types (void)
.types = "string",
NULL
},
{
.name = "on-clock",
.description = "Wait until the test clock get a new pending entry"
" see #gst_test_clock_wait_for_next_pending_id.",
.mandatory = FALSE,
.types = "boolean",
NULL
},
{NULL}
}),
"Waits for signal 'signal-name', message 'message-type', or during 'duration' seconds",
@ -6219,6 +6236,7 @@ register_action_types (void)
.types = "GstClockTime",
NULL
},
{NULL}
}), "Crank the clock, possibly checking how much time was supposed to be waited on the clock"
" and/or the clock running time after the crank."
" Using one `crank-clock` action in a scenario implies that the scenario is driving the "
@ -6312,6 +6330,7 @@ register_action_types (void)
.mandatory = TRUE,
.types = "GstClockTime",
NULL },
{NULL}
}),
"Check current pipeline position.\n", GST_VALIDATE_ACTION_TYPE_NONE);
/* *INDENT-ON* */

12
validate/gst/validate/validate.c
View file

@ -155,11 +155,11 @@ get_test_file_meta (void)
return NULL;
}
static GList *
static void
create_config (const gchar * config)
{
GstStructure *local_vars;
GList *structures = NULL, *result = NULL, *tmp;
GList *structures = NULL, *tmp;
gchar *config_file = NULL;
GFile *f;
@ -212,7 +212,7 @@ create_config (const gchar * config)
loaded_globals = TRUE;
gst_structure_free (local_vars);
return result;
g_list_free (structures);
}
static GList *
@ -457,7 +457,10 @@ void
gst_validate_deinit (void)
{
g_mutex_lock (&_gst_validate_registry_mutex);
_free_plugin_config (core_config);
g_list_free (core_config);
core_config = NULL;
g_list_free_full (all_configs, (GDestroyNotify) gst_structure_free);
gst_validate_deinit_runner ();
@ -470,7 +473,6 @@ gst_validate_deinit (void)
g_clear_pointer (&global_testfile, g_free);
_priv_validate_override_registry_deinit ();
core_config = NULL;
validate_initialized = FALSE;
gst_validate_report_deinit ();