mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-19 16:21:17 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate:scenario: Allow using set-vars from numeric expressions

Browse source 
And require them to follow the `$varname` (can't be $(varname) as
parenthesis have another meaning in those expressions).

Still accept "duration" and "position" as varname for backward compat
but update our scenarios anyway.
This commit is contained in:
Thibault Saunier 2019-02-02 13:43:35 -03:00 committed by Thibault Saunier
parent 28e041b2cb
commit be854d4be8
10 changed files with 55 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
validate/data/scenarios/fast_forward.scenario
View file

@ -1,8 +1,8 @@
description, duration=25.0, seek=true, need-clock-sync=true, min-media-duration=5.0
include,location=includes/default-seek-flags.scenario
seek, name=Fast-forward-seek, playback-time=0.0, rate=2.0, start=0.0, flags="$(default-flags)"
seek, name=Fast-forward-seek, playback-time="min(10.0, duration*0.0625)", rate=4.0, start=0.0, flags="$(default-flags)"
seek, name=Fast-forward-seek, playback-time="min(20.0, duration*0.125)", rate=8.0, start=0.0, flags="$(default-flags)"
seek, name=Fast-forward-seek, playback-time="min(40.0, duration*0.25)", rate=16.0, start=0.0, flags="$(default-flags)"
seek, name=Fast-forward-seek, playback-time="min(80.0, duration*0.50)", rate=32.0, start=0.0, flags="$(default-flags)"
stop, playback-time="min(duration - 0.3, 160.0)"
seek, name=Fast-forward-seek, playback-time="min(10.0, $duration * 0.0625)", rate=4.0, start=0.0, flags="$(default-flags)"
seek, name=Fast-forward-seek, playback-time="min(20.0, $duration * 0.125)", rate=8.0, start=0.0, flags="$(default-flags)"
seek, name=Fast-forward-seek, playback-time="min(40.0, $duration * 0.25)", rate=16.0, start=0.0, flags="$(default-flags)"
seek, name=Fast-forward-seek, playback-time="min(80.0, $duration * 0.50)", rate=32.0, start=0.0, flags="$(default-flags)"
stop, playback-time="min($duration - 0.3, 160.0)"

2
validate/data/scenarios/reverse_playback.scenario
View file

@ -1,3 +1,3 @@
description, seek=true, reverse-playback=true
include,location=includes/default-seek-flags.scenario
seek, name=Reverse-seek, playback-time=0.0, rate=-1.0, start="max(duration - 15.0, 0.0)", stop=duration, flags="$(default-flags)"
seek, name=Reverse-seek, playback-time=0.0, rate=-1.0, start="max($duration - 15.0, 0.0)", stop=$(duration), flags="$(default-flags)"

4
validate/data/scenarios/scrub_backward_seeking.scenario
View file

@ -1,8 +1,8 @@
description, seek=true, handles-states=true, needs_preroll=true
include,location=includes/default-seek-flags.scenario
pause, playback-time=0.0
seek, playback-time=0.0, start="duration - 0.5", flags="$(default-flags)"
seek, playback-time=0.0, start=position-0.1, repeat="min(10, (duration - 0.6))/0.1", flags="$(default-flags)"
seek, playback-time=0.0, start="$duration - 0.5", flags="$(default-flags)"
seek, playback-time=0.0, start=position-0.1, repeat="min(10, ($duration - 0.6))/0.1", flags="$(default-flags)"
play, playback-time=0.0
stop, playback-time=1.0

4
validate/data/scenarios/scrub_backward_seeking_full.scenario
View file

@ -1,8 +1,8 @@
description, seek=true, handles-states=true, needs_preroll=true
include,location=includes/default-seek-flags.scenario
pause, playback-time=0.0
seek, playback-time=0.0, start="duration - 0.5", flags="$(default-flags)"
seek, playback-time=0.0, start=position-0.1, repeat="(duration - 0.6)/0.1", flags="$(default-flags)"
seek, playback-time=0.0, start="$duration - 0.5", flags="$(default-flags)"
seek, playback-time=0.0, start=position-0.1, repeat="($duration - 0.6)/0.1", flags="$(default-flags)"
play, playback-time=0.0
stop, playback-time=1.0

2
validate/data/scenarios/scrub_forward_seeking.scenario
View file

@ -1,6 +1,6 @@
description, seek=true, handles-states=true, needs_preroll=true
include,location=includes/default-seek-flags.scenario
pause, playback-time=0.0
seek, playback-time=0.0, start=position+0.1, repeat="min(10, (duration - 0.5))/0.1", flags="$(default-flags)"
seek, playback-time=0.0, start=position+0.1, repeat="min(10, ($duration - 0.5))/0.1", flags="$(default-flags)"
play, playback-time=0.0
stop, playback-time=1.0

2
validate/data/scenarios/scrub_forward_seeking_full.scenario
View file

@ -1,6 +1,6 @@
description, seek=true, handles-states=true, needs_preroll=true
include,location=includes/default-seek-flags.scenario
pause, playback-time=0.0
seek, playback-time=0.0, start=position+0.1, repeat="(duration - 0.5)/0.1", flags="$(default-flags)"
seek, playback-time=0.0, start=position+0.1, repeat="($duration - 0.5)/0.1", flags="$(default-flags)"
play, playback-time=0.0
stop, playback-time=1.0

8
validate/data/scenarios/seek_backward.scenario
View file

@ -1,6 +1,6 @@
description, seek=true, duration=30, need-clock-sync=true
include,location=includes/default-seek-flags.scenario
seek, name=Backward-seek, playback-time="min(5.0, (duration/4))", rate=1.0, start=0.0, flags="$(default-flags)"
seek, name=Backward-seek, playback-time="min(10.0, 2*(duration/4))", rate=1.0, start="min(5.0, duration/4)", flags="$(default-flags)"
seek, name=Backward-seek, playback-time="min(15.0, 3*(duration/4))", rate=1.0, start="min(10.0, 2*(duration/4))", flags="$(default-flags)"
stop, playback-time="min(15.0, 3*(duration/4))"
seek, name=Backward-seek, playback-time="min(5.0, ($duration / 4))", rate=1.0, start=0.0, flags="$(default-flags)"
seek, name=Backward-seek, playback-time="min(10.0, 2*($duration / 4))", rate=1.0, start="min(5.0, $duration / 4)", flags="$(default-flags)"
seek, name=Backward-seek, playback-time="min(15.0, 3*($duration / 4))", rate=1.0, start="min(10.0, 2*($duration / 4))", flags="$(default-flags)"
stop, playback-time="min(15.0, 3*($duration / 4))"

7
validate/data/scenarios/seek_forward.scenario
View file

@ -1,6 +1,7 @@
description, seek=true, duration=20, need-clock-sync=true
include,location=includes/default-seek-flags.scenario
seek, name=First-forward-seek, playback-time="min(5.0, (duration/8))", start="min(10, 2*(duration/8))", flags="$(default-flags)"
seek, name=Second-forward-seek, playback-time="min(15.0, 3*(duration/8))", start="min(20, 4*(duration/8))", flags="$(default-flags)"
seek, name=Third-forward-seek, playback-time="min(25, 5*(duration/8))", start="min(30.0, 6*(duration/8))", flags="$(default-flags)"
set-vars, test=(string)5.0
seek, name=First-forward-seek, playback-time="min($test, ($duration/8))", start="min(10, 2*($duration/8))", flags="$(default-flags)"
seek, name=Second-forward-seek, playback-time="min(15.0, 3*($duration/8))", start="min(20, 4*($duration/8))", flags="$(default-flags)"
seek, name=Third-forward-seek, playback-time="min(25, 5*($duration/8))", start="min(30.0, 6*($duration/8))", flags="$(default-flags)"
stop, playback-time=35.0

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

@ -441,6 +441,8 @@ static gboolean
_set_variable_func (const gchar * name, double *value, gpointer user_data)
{
gboolean res;
const gchar *value_str;
gchar *tmp;
GstValidateScenario *scenario = GST_VALIDATE_SCENARIO (user_data);
GstElement *pipeline = gst_validate_scenario_get_pipeline (scenario);
@ -450,7 +452,7 @@ _set_variable_func (const gchar * name, double *value, gpointer user_data)
return FALSE;
}
if (!g_strcmp0 (name, "duration")) {
if (!g_strcmp0 (name, "$duration") || !g_strcmp0 (name, "duration")) {
gint64 duration;
if (!(res =
@ -478,7 +480,7 @@ _set_variable_func (const gchar * name, double *value, gpointer user_data)
*value = ((double) duration / GST_SECOND);
goto done;
} else if (!g_strcmp0 (name, "position")) {
} else if (!g_strcmp0 (name, "$position") || !g_strcmp0 (name, "position")) {
gint64 position;
if (!gst_element_query_position (pipeline, GST_FORMAT_TIME, &position)) {
@ -494,13 +496,34 @@ _set_variable_func (const gchar * name, double *value, gpointer user_data)
goto done;
}
fail:
gst_object_unref (pipeline);
return FALSE;
if (name[0] != '$') {
g_error ("Variable name %s is invalid as it doesn't start with $", name);
goto fail;
}
if (gst_structure_get_double (scenario->priv->vars, &name[1], value))
goto done;
value_str = gst_structure_get_string (scenario->priv->vars, &name[1]);
*value = g_strtod (value_str, &tmp);
if (tmp[0] != '\0') {
gchar *vars = gst_structure_to_string (scenario->priv->vars);
g_error ("Variable name: %s=%s is not a double (%s)", name, value_str,
vars);
g_free (vars);
goto fail;
}
done:
gst_object_unref (pipeline);
return TRUE;
fail:
gst_object_unref (pipeline);
return FALSE;
}
/* Check that @list doesn't contain any non-optional actions */
@ -1757,8 +1780,8 @@ gst_validate_execute_action (GstValidateActionType * action_type,
gst_object_unref (scenario);
if (!gst_structure_has_field (action->structure, "sub-action")) {
gst_structure_free (action->structure);
gst_structure_free (action->structure);
action->priv->printed = FALSE;
action->structure = gst_structure_copy (action->priv->main_structure);

9
validate/gst/validate/gst-validate-utils.c
View file

@ -361,8 +361,8 @@ _read_builtin (MathParser * parser)
gint pos = 0;
c = _peek (parser);
if (isalpha (c) || c == '_') {
while (isalpha (c) || isdigit (c) || c == '_') {
if (isalpha (c) || c == '_' || c == '$') {
while (isalpha (c) || isdigit (c) || c == '_' || c == '$') {
token[pos++] = _next (parser);
c = _peek (parser);
}
@ -389,7 +389,10 @@ _read_builtin (MathParser * parser)
&& parser->variable_func (token, &v1, parser->user_data)) {
v0 = v1;
} else {
_error (parser, "Could not look up value for variable %s!");
gchar *err =
g_strdup_printf ("Could not look up value for variable %s!", token);
_error (parser, err);
g_free (err);
}
}
} else {