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: make sure to not execute actions when changing state.

Browse source 
Conflicts:
	validate/gst/validate/gst-validate-scenario.c
This commit is contained in:
Mathieu Duponchelle 2014-05-05 17:00:45 +02:00
parent 49ab41743b
commit 1332e9fc4f
1 changed files with 34 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -87,6 +87,9 @@ struct _GstValidateScenarioPrivate
guint wait_id; guint wait_id;
gboolean buffering; gboolean buffering;
gboolean changing_state;
GstState target_state;
}; };
typedef struct KeyFileGroupName typedef struct KeyFileGroupName
@ -132,7 +135,6 @@ gst_validate_action_init (GstValidateAction * action)
gst_mini_object_init (((GstMiniObject *) action), 0, gst_mini_object_init (((GstMiniObject *) action), 0,
_gst_validate_action_type, (GstMiniObjectCopyFunction) _action_copy, NULL, _gst_validate_action_type, (GstMiniObjectCopyFunction) _action_copy, NULL,
(GstMiniObjectFreeFunction) _action_free); (GstMiniObjectFreeFunction) _action_free);
} }
static GstValidateAction * static GstValidateAction *
@ -307,6 +309,7 @@ static gboolean
_execute_pause (GstValidateScenario * scenario, GstValidateAction * action) _execute_pause (GstValidateScenario * scenario, GstValidateAction * action)
{ {
gdouble duration = 0; gdouble duration = 0;
GstStateChangeReturn ret;
gst_structure_get_double (action->structure, "duration", &duration); gst_structure_get_double (action->structure, "duration", &duration);
gst_validate_printf (action, "pausing for %" GST_TIME_FORMAT "\n", gst_validate_printf (action, "pausing for %" GST_TIME_FORMAT "\n",
@ -315,13 +318,20 @@ _execute_pause (GstValidateScenario * scenario, GstValidateAction * action)
GST_DEBUG ("Pausing for %" GST_TIME_FORMAT, GST_DEBUG ("Pausing for %" GST_TIME_FORMAT,
GST_TIME_ARGS (duration * GST_SECOND)); GST_TIME_ARGS (duration * GST_SECOND));
if (gst_element_set_state (scenario->pipeline, GST_STATE_PAUSED) == scenario->priv->target_state = GST_STATE_PAUSED;
GST_STATE_CHANGE_FAILURE) { scenario->priv->changing_state = TRUE;
ret = gst_element_set_state (scenario->pipeline, GST_STATE_PAUSED);
if (ret == GST_STATE_CHANGE_FAILURE) {
GST_VALIDATE_REPORT (scenario, STATE_CHANGE_FAILURE, GST_VALIDATE_REPORT (scenario, STATE_CHANGE_FAILURE,
"Failed to set state to paused"); "Failed to set state to paused");
return FALSE; return FALSE;
} else if (ret == GST_STATE_CHANGE_SUCCESS) {
scenario->priv->changing_state = FALSE;
} }
if (duration) if (duration)
g_timeout_add (duration * 1000, g_timeout_add (duration * 1000,
(GSourceFunc) _pause_action_restore_playing, scenario); (GSourceFunc) _pause_action_restore_playing, scenario);
@ -332,17 +342,25 @@ _execute_pause (GstValidateScenario * scenario, GstValidateAction * action)
static gboolean static gboolean
_execute_play (GstValidateScenario * scenario, GstValidateAction * action) _execute_play (GstValidateScenario * scenario, GstValidateAction * action)
{ {
GstStateChangeReturn ret;
gst_validate_printf (action, "Playing back\n"); gst_validate_printf (action, "Playing back\n");
GST_DEBUG ("Playing back"); GST_DEBUG ("Playing back");
if (gst_element_set_state (scenario->pipeline, GST_STATE_PLAYING) == scenario->priv->target_state = GST_STATE_PLAYING;
GST_STATE_CHANGE_FAILURE) { scenario->priv->changing_state = TRUE;
ret = gst_element_set_state (scenario->pipeline, GST_STATE_PAUSED);
if (ret == GST_STATE_CHANGE_FAILURE) {
GST_VALIDATE_REPORT (scenario, STATE_CHANGE_FAILURE, GST_VALIDATE_REPORT (scenario, STATE_CHANGE_FAILURE,
"Failed to set state to playing"); "Failed to set state to playing");
return FALSE; return FALSE;
} else if (ret == GST_STATE_CHANGE_SUCCESS) {
scenario->priv->changing_state = FALSE;
} }
gst_element_get_state (scenario->pipeline, NULL, NULL, -1); gst_element_get_state (scenario->pipeline, NULL, NULL, -1);
return TRUE; return TRUE;
} }
@ -624,6 +642,12 @@ get_position (GstValidateScenario * scenario)
return TRUE; return TRUE;
} }
if (priv->changing_state) {
GST_DEBUG_OBJECT (scenario,
"Changing state, not executing any action");
return TRUE;
}
query = gst_query_new_segment (GST_FORMAT_DEFAULT); query = gst_query_new_segment (GST_FORMAT_DEFAULT);
if (gst_element_query (GST_ELEMENT (scenario->pipeline), query)) if (gst_element_query (GST_ELEMENT (scenario->pipeline), query))
gst_query_parse_segment (query, &rate, NULL, NULL, NULL); gst_query_parse_segment (query, &rate, NULL, NULL, NULL);
@ -852,6 +876,11 @@ message_cb (GstBus * bus, GstMessage * message, GstValidateScenario * scenario)
&pstate, &nstate, NULL); &pstate, &nstate, NULL);
if (pstate == GST_STATE_READY && nstate == GST_STATE_PAUSED) if (pstate == GST_STATE_READY && nstate == GST_STATE_PAUSED)
_add_get_position_source (scenario); _add_get_position_source (scenario);
if (GST_MESSAGE_SRC (message) == GST_OBJECT(scenario->pipeline)) {
if (scenario->priv->target_state == nstate)
scenario->priv->changing_state = FALSE;
}
} }
break; break;
} }