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

scenario: Do not concider we are seek_in_paused if executing a new action

Browse source 
The new action might change the position on purpose and we should not
fail in that case.

Also at that point we know the test of position after the seek has
been executed

+ Minor cosmetic fixes

https://bugzilla.gnome.org/show_bug.cgi?id=743994
This commit is contained in:
Thibault Saunier 2015-02-02 11:41:24 +01:00
parent be20eb015c
commit fbfcf16b20
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1052,7 +1052,7 @@ get_position (GstValidateScenario * scenario)
GST_DEBUG_OBJECT (scenario, "Executing %" GST_PTR_FORMAT
" at %" GST_TIME_FORMAT, act->structure, GST_TIME_ARGS (position));
priv->seeked_in_pause = FALSE;
act->state = type->execute (scenario, act);
if (act->state == GST_VALIDATE_EXECUTE_ACTION_ERROR) {
gchar *str = gst_structure_to_string (act->structure);
@ -1095,11 +1095,12 @@ stop_waiting (GstValidateAction * action)
{
GstValidateScenarioPrivate *priv = action->scenario->priv;
gst_validate_printf (action->scenario, "Stop waiting\n");
priv->wait_id = 0;
gst_validate_action_set_done (action);
_add_get_position_source (action->scenario);
gst_validate_printf (action->scenario, "Stop waiting\n");
return G_SOURCE_REMOVE;
}
@ -1126,7 +1127,7 @@ _execute_wait (GstValidateScenario * scenario, GstValidateAction * action)
if (wait_multiplier == 0) {
GST_INFO_OBJECT (scenario, "I have been told not to wait...");
return GST_VALIDATE_EXECUTE_ACTION_ERROR;
return GST_VALIDATE_EXECUTE_ACTION_OK;
}
}