mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-30 13:41:48 +00:00
Code Issues 1 Projects Releases Wiki Activity

tests: integration: Rework the way we handle seeking while fully paused

Browse source 
The idea is that we should first play until the time we reach the first
position, at that point we PAUSE the pipeline, then, afterward do the
seeks as asked.

If we get the position before the ASYNC DONE, just accept it.
This commit is contained in:
Thibault Saunier 2013-08-06 18:35:24 +02:00
parent 4ca7a4ef91
commit eab86c2913
1 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tests/check/ges/integration.c
View file

@ -211,6 +211,12 @@ my_bus_callback (GstBus * bus, GstMessage * message, gpointer data)
got_async_done = TRUE; got_async_done = TRUE;
if (GST_CLOCK_TIME_IS_VALID (seeked_position)) if (GST_CLOCK_TIME_IS_VALID (seeked_position))
seeked_position = GST_CLOCK_TIME_NONE; seeked_position = GST_CLOCK_TIME_NONE;
if (seeks == NULL && seek_paused_noplay) {
/* We are now done with seeking, let it play until the end */
gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING);
gst_element_get_state (GST_ELEMENT (pipeline), NULL, NULL, -1);
}
break; break;
default: default:
/* unhandled message */ /* unhandled message */
@ -234,6 +240,7 @@ get_position (void)
if ((position >= (seek->seeking_position - seek_tol)) if ((position >= (seek->seeking_position - seek_tol))
&& (position <= (seek->seeking_position + seek_tol))) { && (position <= (seek->seeking_position + seek_tol))) {
if (!got_async_done)
fail_if (GST_CLOCK_TIME_IS_VALID (seeked_position)); fail_if (GST_CLOCK_TIME_IS_VALID (seeked_position));
got_async_done = FALSE; got_async_done = FALSE;
@ -242,6 +249,13 @@ get_position (void)
seeked_position = seek->position; seeked_position = seek->position;
if (seek_paused) { if (seek_paused) {
gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PAUSED);
GST_LOG ("Set state playing");
gst_element_get_state (GST_ELEMENT (pipeline), NULL, NULL, -1);
GST_LOG ("Done wainting");
}
if (seek_paused_noplay) {
gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PAUSED); gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PAUSED);
gst_element_get_state (GST_ELEMENT (pipeline), NULL, NULL, -1); gst_element_get_state (GST_ELEMENT (pipeline), NULL, NULL, -1);
} }
@ -262,10 +276,6 @@ get_position (void)
} }
/* if seeking paused without playing and we reached the last seek, just play /* if seeking paused without playing and we reached the last seek, just play
* till the end */ * till the end */
if (!tmp && seek_paused_noplay) {
gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING);
gst_element_get_state (GST_ELEMENT (pipeline), NULL, NULL, -1);
}
return TRUE; return TRUE;
} }
@ -338,10 +348,8 @@ check_timeline (GESTimeline * timeline)
gst_object_unref (bus); gst_object_unref (bus);
ges_pipeline_add_timeline (pipeline, timeline); ges_pipeline_add_timeline (pipeline, timeline);
if (!seek_paused_noplay) {
gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING); gst_element_set_state (GST_ELEMENT (pipeline), GST_STATE_PLAYING);
gst_element_get_state (GST_ELEMENT (pipeline), NULL, NULL, -1); gst_element_get_state (GST_ELEMENT (pipeline), NULL, NULL, -1);
}
GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS (GST_BIN (pipeline), GST_DEBUG_BIN_TO_DOT_FILE_WITH_TS (GST_BIN (pipeline),
GST_DEBUG_GRAPH_SHOW_ALL, "ges-integration-playing"); GST_DEBUG_GRAPH_SHOW_ALL, "ges-integration-playing");
if (seeks != NULL) if (seeks != NULL)