mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-05 23:18:52 +00:00
Code Issues 1 Projects Releases Wiki Activity

validate:scenario: Make sure to actually test position to execute actions

Browse source
This commit is contained in:
Thibault Saunier 2015-05-20 13:57:55 +02:00
parent 9ef7943369
commit e832785604
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -999,13 +999,13 @@ _get_position (GstValidateScenario * scenario,
} }
static gboolean static gboolean
_check_position (GstValidateScenario * scenario, GstValidateAction * act) _check_position (GstValidateScenario * scenario, GstValidateAction * act,
GstClockTime * position)
{ {
GstQuery *query; GstQuery *query;
gdouble rate; gdouble rate;
GstClockTime start_with_tolerance, stop_with_tolerance; GstClockTime start_with_tolerance, stop_with_tolerance;
GstClockTime position = GST_CLOCK_TIME_NONE;
GstValidateScenarioPrivate *priv = scenario->priv; GstValidateScenarioPrivate *priv = scenario->priv;
if (scenario->pipeline == NULL) { if (scenario->pipeline == NULL) {
@ -1014,11 +1014,11 @@ _check_position (GstValidateScenario * scenario, GstValidateAction * act)
return TRUE; return TRUE;
} }
if (!_get_position (scenario, act, &position)) if (!_get_position (scenario, act, position))
return FALSE; return FALSE;
GST_DEBUG_OBJECT (scenario, "Current position: %" GST_TIME_FORMAT, GST_DEBUG_OBJECT (scenario, "Current position: %" GST_TIME_FORMAT,
GST_TIME_ARGS (position)); GST_TIME_ARGS (*position));
/* Check if playback is within seek segment */ /* Check if playback is within seek segment */
start_with_tolerance = start_with_tolerance =
@ -1028,13 +1028,13 @@ _check_position (GstValidateScenario * scenario, GstValidateAction * act)
priv->seek_pos_tol : -1; priv->seek_pos_tol : -1;
if ((GST_CLOCK_TIME_IS_VALID (stop_with_tolerance) if ((GST_CLOCK_TIME_IS_VALID (stop_with_tolerance)
&& position > stop_with_tolerance) && *position > stop_with_tolerance)
|| (priv->seek_flags & GST_SEEK_FLAG_ACCURATE || (priv->seek_flags & GST_SEEK_FLAG_ACCURATE
&& position < start_with_tolerance)) { && *position < start_with_tolerance)) {
GST_VALIDATE_REPORT (scenario, QUERY_POSITION_OUT_OF_SEGMENT, GST_VALIDATE_REPORT (scenario, QUERY_POSITION_OUT_OF_SEGMENT,
"Current position %" GST_TIME_FORMAT " not in the expected range [%" "Current position %" GST_TIME_FORMAT " not in the expected range [%"
GST_TIME_FORMAT " -- %" GST_TIME_FORMAT, GST_TIME_ARGS (position), GST_TIME_FORMAT " -- %" GST_TIME_FORMAT, GST_TIME_ARGS (*position),
GST_TIME_ARGS (start_with_tolerance), GST_TIME_ARGS (start_with_tolerance),
GST_TIME_ARGS (stop_with_tolerance)); GST_TIME_ARGS (stop_with_tolerance));
} }
@ -1045,16 +1045,16 @@ _check_position (GstValidateScenario * scenario, GstValidateAction * act)
gst_query_unref (query); gst_query_unref (query);
if (priv->seeked_in_pause && priv->seek_flags & GST_SEEK_FLAG_ACCURATE) { if (priv->seeked_in_pause && priv->seek_flags & GST_SEEK_FLAG_ACCURATE) {
if ((rate > 0 && (position >= priv->segment_start + priv->seek_pos_tol || if ((rate > 0 && (*position >= priv->segment_start + priv->seek_pos_tol ||
position < MIN (0, *position < MIN (0,
((gint64) priv->segment_start - priv->seek_pos_tol)))) ((gint64) priv->segment_start - priv->seek_pos_tol))))
|| (rate < 0 && (position > priv->segment_start + priv->seek_pos_tol || (rate < 0 && (*position > priv->segment_start + priv->seek_pos_tol
|| position < MIN (0, || *position < MIN (0,
(gint64) priv->segment_start - priv->seek_pos_tol)))) { (gint64) priv->segment_start - priv->seek_pos_tol)))) {
GST_VALIDATE_REPORT (scenario, EVENT_SEEK_RESULT_POSITION_WRONG, GST_VALIDATE_REPORT (scenario, EVENT_SEEK_RESULT_POSITION_WRONG,
"Reported position after accurate seek in PAUSED state should be exactlty" "Reported position after accurate seek in PAUSED state should be exactlty"
" what the user asked for %" GST_TIME_FORMAT " != %" GST_TIME_FORMAT, " what the user asked for %" GST_TIME_FORMAT " != %" GST_TIME_FORMAT,
GST_TIME_ARGS (position), GST_TIME_ARGS (priv->segment_start)); GST_TIME_ARGS (*position), GST_TIME_ARGS (priv->segment_start));
} }
} }
@ -1341,7 +1341,7 @@ execute_next_action (GstValidateScenario * scenario)
{ {
GList *tmp; GList *tmp;
gdouble rate = 1.0; gdouble rate = 1.0;
gint64 position = -1; GstClockTime position = -1;
GstValidateAction *act = NULL; GstValidateAction *act = NULL;
GstValidateActionType *type; GstValidateActionType *type;
@ -1392,7 +1392,7 @@ execute_next_action (GstValidateScenario * scenario)
} }
} }
if (!_check_position (scenario, act)) if (!_check_position (scenario, act, &position))
return G_SOURCE_CONTINUE; return G_SOURCE_CONTINUE;
if (!_should_execute_action (scenario, act, position, rate)) { if (!_should_execute_action (scenario, act, position, rate)) {