mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 15:27:07 +00:00
Code Issues 1 Projects Releases Wiki Activity

scenario: Mark seek as done only when reaching next state

Browse source 
There is a race where following actions could generate a
flush-start/flush-stop dance but the state change resulting from the
seek hasn't been committed yet, leading to the ASYNC_START being
ignored by GstBin since its pending_state is not VOID when receiving
the ASYNC_START message.

Conceptually it is totally correct to consider an action done when
the state change of the pipeline is stabilized..

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-devtools/-/merge_requests/198>
This commit is contained in:
Thibault Saunier 2020-05-14 18:45:11 -04:00 committed by GStreamer Merge Bot
parent e49876bb05
commit e1ad840494
1 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3349,6 +3349,20 @@ gst_validate_scenario_check_latency (GstValidateScenario * scenario,
} }
} }
static gboolean
gst_validate_scenario_is_flush_seeking (GstValidateScenario * scenario)
{
GstValidateSeekInformation *seekinfo = scenario->priv->current_seek;
if (!seekinfo)
return FALSE;
if (!(seekinfo->flags & GST_SEEK_FLAG_FLUSH))
return FALSE;
return seekinfo->action->priv->state == GST_VALIDATE_EXECUTE_ACTION_ASYNC;
}
static gboolean static gboolean
message_cb (GstBus * bus, GstMessage * message, GstValidateScenario * scenario) message_cb (GstBus * bus, GstMessage * message, GstValidateScenario * scenario)
{ {
@ -3366,12 +3380,8 @@ message_cb (GstBus * bus, GstMessage * message, GstValidateScenario * scenario)
switch (GST_MESSAGE_TYPE (message)) { switch (GST_MESSAGE_TYPE (message)) {
case GST_MESSAGE_ASYNC_DONE: case GST_MESSAGE_ASYNC_DONE:
if (priv->current_seek if (!gst_validate_scenario_is_flush_seeking (scenario) &&
&& ((priv->current_seek->flags & GST_SEEK_FLAG_FLUSH) && scenario->priv->needs_async_done) {
(priv->current_seek->action->priv->state ==
GST_VALIDATE_EXECUTE_ACTION_ASYNC))) {
gst_validate_action_set_done (priv->current_seek->action);
} else if (scenario->priv->needs_async_done) {
scenario->priv->needs_async_done = FALSE; scenario->priv->needs_async_done = FALSE;
if (priv->actions && _action_sets_state (priv->actions->data) if (priv->actions && _action_sets_state (priv->actions->data)
&& !priv->changing_state) && !priv->changing_state)
@ -3387,10 +3397,12 @@ message_cb (GstBus * bus, GstMessage * message, GstValidateScenario * scenario)
break; break;
case GST_MESSAGE_STATE_CHANGED: case GST_MESSAGE_STATE_CHANGED:
{ {
if (pipeline && GST_MESSAGE_SRC (message) == GST_OBJECT (pipeline)) {
GstState nstate, pstate;
gst_message_parse_state_changed (message, &pstate, &nstate, NULL); if (pipeline && GST_MESSAGE_SRC (message) == GST_OBJECT (pipeline)) {
GstState pstate, nstate, pending_state;
gst_message_parse_state_changed (message, &pstate, &nstate,
&pending_state);
if (pstate == GST_STATE_PAUSED && nstate == GST_STATE_READY) { if (pstate == GST_STATE_PAUSED && nstate == GST_STATE_READY) {
/* Reset sink information */ /* Reset sink information */
@ -3403,6 +3415,11 @@ message_cb (GstBus * bus, GstMessage * message, GstValidateScenario * scenario)
SCENARIO_UNLOCK (scenario); SCENARIO_UNLOCK (scenario);
} }
if (gst_validate_scenario_is_flush_seeking (scenario)
&& pending_state == GST_STATE_VOID_PENDING) {
gst_validate_action_set_done (priv->current_seek->action);
}
if (scenario->priv->changing_state && if (scenario->priv->changing_state &&
scenario->priv->target_state == nstate) { scenario->priv->target_state == nstate) {
scenario->priv->changing_state = FALSE; scenario->priv->changing_state = FALSE;