From 8852633dfc3fbe819030cb7f6645ea3b5fc40a10 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Fri, 25 Apr 2014 13:42:03 +0200 Subject: [PATCH] validate:scenarios: Prefer stop action instead of EOS when appropriate --- validate/data/adaptive_video_framerate.scenario | 2 +- validate/data/adaptive_video_framerate_size.scenario | 1 + validate/data/adaptive_video_size.scenario | 1 + validate/data/force_key_unit.scenario | 1 + validate/data/pause_resume.scenario | 1 + validate/data/play_15s.scenario | 1 + validate/data/scrub_forward_seeking.scenario | 2 +- validate/data/seek_backward.scenario | 2 +- validate/data/seek_forward.scenario | 2 +- validate/data/switch_audio_track.scenario | 3 ++- 10 files changed, 11 insertions(+), 5 deletions(-) diff --git a/validate/data/adaptive_video_framerate.scenario b/validate/data/adaptive_video_framerate.scenario index e809cf773f..9441bc27c9 100644 --- a/validate/data/adaptive_video_framerate.scenario +++ b/validate/data/adaptive_video_framerate.scenario @@ -2,4 +2,4 @@ description, duration=15.0 set-restriction, playback_time=5.0, restriction-caps="video/x-raw,framerate=(fraction)5/1" set-restriction, playback_time=10.0, restriction-caps="video/x-raw,framerate=(fraction)30/1" eos, playback_time=15.0 - +stop, playback_time=15.0 diff --git a/validate/data/adaptive_video_framerate_size.scenario b/validate/data/adaptive_video_framerate_size.scenario index 2289671751..eb6013b4cf 100644 --- a/validate/data/adaptive_video_framerate_size.scenario +++ b/validate/data/adaptive_video_framerate_size.scenario @@ -4,3 +4,4 @@ set-restriction, playback_time=10.0, restriction-caps="video/x-raw,height=20,wid set-restriction, playback_time=15.0, restriction-caps="video/x-raw,height=20,width=20,framerate=(fraction)30/1" set-restriction, playback_time=20.0, restriction-caps="video/x-raw,height=720,width=1280,framerate=(fraction)30/1" eos, playback_time=25.0 +stop, playback_time=25.0 diff --git a/validate/data/adaptive_video_size.scenario b/validate/data/adaptive_video_size.scenario index 5cbb283df2..315af9130e 100644 --- a/validate/data/adaptive_video_size.scenario +++ b/validate/data/adaptive_video_size.scenario @@ -2,3 +2,4 @@ description, duration=15.0 set-restriction, playback_time=5.0, restriction-caps="video/x-raw,height=480,width=854" set-restriction, playback_time=10.0, restriction-caps="video/x-raw,height=720,width=1280" eos, playback_time=15.0 +stop, playback_time=15.0 diff --git a/validate/data/force_key_unit.scenario b/validate/data/force_key_unit.scenario index bd14dca0e9..ba4185d2e2 100644 --- a/validate/data/force_key_unit.scenario +++ b/validate/data/force_key_unit.scenario @@ -1,3 +1,4 @@ description, duration=2.0 video-request-key-unit, playback_time=1.0, direction=upstream, running_time=-1.0, all-header=true, count=1 eos, playback_time=2.0 +stop, playback_time=2.0 diff --git a/validate/data/pause_resume.scenario b/validate/data/pause_resume.scenario index 4f1faa5ebc..3bbb9100e6 100644 --- a/validate/data/pause_resume.scenario +++ b/validate/data/pause_resume.scenario @@ -3,3 +3,4 @@ pause, name=First-pause, playback_time=1.0, duration=1.0 pause, name=Second-pause, playback_time=3.0, duration=5.0 pause, name=Third-pause, playback_time=5.0, duration=1.0 eos, name=Done-testing, playback_time=7.0 +stop, playback_time=7.0 diff --git a/validate/data/play_15s.scenario b/validate/data/play_15s.scenario index 13d36af0be..28eb80e87f 100644 --- a/validate/data/play_15s.scenario +++ b/validate/data/play_15s.scenario @@ -1,2 +1,3 @@ description, duration=15.0 eos, playback_time=15.0 +stop, playback_time=15.0 diff --git a/validate/data/scrub_forward_seeking.scenario b/validate/data/scrub_forward_seeking.scenario index 45c93c6d3f..e5637ab33e 100644 --- a/validate/data/scrub_forward_seeking.scenario +++ b/validate/data/scrub_forward_seeking.scenario @@ -2,4 +2,4 @@ description, seek=true pause, playback_time=0.0 seek, playback_time=0.0, start=position+0.1, repeat="min(10, (duration - 0.5))/0.1", flags=accurate+flush play, playback_time=0.0 -eos, name="EOS", playback_time=1.0 +stop, playback_time=1.0 diff --git a/validate/data/seek_backward.scenario b/validate/data/seek_backward.scenario index 995f851ab0..20b71ae4b8 100644 --- a/validate/data/seek_backward.scenario +++ b/validate/data/seek_backward.scenario @@ -2,4 +2,4 @@ description, seek=true, duration=30 seek, name=Backward-seek, playback_time="min(5.0, (duration/4))", rate=1.0, start=0.0, flags=accurate+flush seek, name=Backward-seek, playback_time="min(10.0, 2*(duration/4))", rate=1.0, start="min(5.0, duration/4)", flags=accurate+flush seek, name=Backward-seek, playback_time="min(15.0, 3*(duration/4))", rate=1.0, start="min(10.0, 2*(duration/4))", flags=accurate+flush -eos, playback_time="min(15.0, 3*(duration/4))" +stop, playback_time="min(15.0, 3*(duration/4))" diff --git a/validate/data/seek_forward.scenario b/validate/data/seek_forward.scenario index 3740d74a84..c1fa55fb77 100644 --- a/validate/data/seek_forward.scenario +++ b/validate/data/seek_forward.scenario @@ -2,4 +2,4 @@ description, seek=true, duration=20 seek, name=First-forward-seek, playback_time="min(5.0, (duration/8))", start="min(10, 2*(duration/8))", flags=accurate+flush seek, name=Second-forward-seek, playback_time="min(15.0, 3*(duration/8))", start="min(20, 4*(duration/8))", flags=accurate+flush seek, name=Third-forward-seek, playback_time="min(25, 5*(duration/8))", start="min(30.0, 6*(duration/8))", flags=accurate+flush -eos, name="EOS", playback_time=35.0 +stop, playback_time=35.0 diff --git a/validate/data/switch_audio_track.scenario b/validate/data/switch_audio_track.scenario index 704649b24c..5548341d40 100644 --- a/validate/data/switch_audio_track.scenario +++ b/validate/data/switch_audio_track.scenario @@ -1,2 +1,3 @@ -description, summary="Change audio track at 5 second to the second audio track", min-audio-track=2 +description, summary="Change audio track at 5 second to the second audio track", min-audio-track=2, duration=10.0 switch-track, name=Next-audio-track, playback_time=5.0, type=audio, index=(string)+1 +stop, playback_time=10.0