mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-03-30 12:49:40 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate:scenario: Allow execution of disable-plugin as a config action

Browse source 
Summary:
And fix a bug where config actions were added to the list of action even
if they had already been executed

Reviewers: Mathieu_Du

Differential Revision: http://phabricator.freedesktop.org/D80
This commit is contained in:
Thibault Saunier 2015-03-06 11:51:19 +01:00
parent 25ab37300d
commit 69ca5c69cc
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1055,6 +1055,7 @@ _fill_action (GstValidateScenario * scenario, GstValidateAction * action,
GstStructure * structure, gboolean add_to_lists) GstStructure * structure, gboolean add_to_lists)
{ {
gdouble playback_time; gdouble playback_time;
gboolean is_config = FALSE;
GstValidateActionType *action_type; GstValidateActionType *action_type;
const gchar *str_playback_time = NULL; const gchar *str_playback_time = NULL;
GstValidateScenarioPrivate *priv = scenario->priv; GstValidateScenarioPrivate *priv = scenario->priv;
@ -1095,12 +1096,13 @@ _fill_action (GstValidateScenario * scenario, GstValidateAction * action,
if (!action->priv->main_structure) if (!action->priv->main_structure)
action->priv->main_structure = gst_structure_copy (structure); action->priv->main_structure = gst_structure_copy (structure);
if (IS_CONFIG_ACTION_TYPE (action_type->flags)) { if (IS_CONFIG_ACTION_TYPE (action_type->flags) ||
(gst_structure_get_boolean (action->structure, "as-config",
&is_config) && is_config == TRUE)) {
gst_validate_print_action (action, NULL);
res = action_type->execute (scenario, action); res = action_type->execute (scenario, action);
gst_validate_action_unref (action);
if (res == GST_VALIDATE_EXECUTE_ACTION_ERROR) return res;
return GST_VALIDATE_EXECUTE_ACTION_ERROR;
} }
if (!add_to_lists) if (!add_to_lists)
@ -3029,6 +3031,13 @@ init_scenarios (void)
.mandatory = TRUE, .mandatory = TRUE,
.types = "string" .types = "string"
}, },
{
.name = "as-config",
.description = "Execute action as a config action (meaning when loading the scenario)",
.mandatory = FALSE,
.types = "boolean",
.def = "false"
},
{NULL} {NULL}
}), }),
"Disables a GstPlugin", "Disables a GstPlugin",