summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Saunier <thibault.saunier@collabora.com>2014-02-12 00:28:41 +0100
committerThibault Saunier <thibault.saunier@collabora.com>2014-02-18 21:07:31 +0100
commitba717f62376803de45a03a8f8111904b2f8a830d (patch)
tree3fc30e77262188c8f8780e39868dd3f8478f0557
parent4467b27b9f7290d3f3fb9bc3dc7e64d01fae5d46 (diff)
validate: Update all scenario to use the new description feature
+ Fix minor issues in scenario files
-rw-r--r--validate/data/adaptive_video_framerate.scenario1
-rw-r--r--validate/data/adaptive_video_framerate_size.scenario1
-rw-r--r--validate/data/adaptive_video_size.scenario3
-rw-r--r--validate/data/alternate_fast_backward_forward.scenario5
-rw-r--r--validate/data/fast_backward.scenario1
-rw-r--r--validate/data/fast_forward.scenario1
-rw-r--r--validate/data/force_key_unit.scenario1
-rw-r--r--validate/data/pause_resume.scenario1
-rw-r--r--validate/data/play_15s.scenario3
-rw-r--r--validate/data/reverse_playback.scenario1
-rw-r--r--validate/data/scrub_forward_seeking.scenario1
-rw-r--r--validate/data/seek_backward.scenario1
-rw-r--r--validate/data/seek_forward.scenario1
-rw-r--r--validate/data/seek_forward_backward.scenario3
-rw-r--r--validate/data/seek_with_stop.scenario1
-rw-r--r--validate/data/simple_seeks.scenario1
-rw-r--r--validate/data/switch_audio_track.scenario1
-rw-r--r--validate/data/update_start.scenario1
-rw-r--r--validate/data/update_stop.scenario2
19 files changed, 25 insertions, 5 deletions
diff --git a/validate/data/adaptive_video_framerate.scenario b/validate/data/adaptive_video_framerate.scenario
index 07ef0c2..e809cf7 100644
--- a/validate/data/adaptive_video_framerate.scenario
+++ b/validate/data/adaptive_video_framerate.scenario
@@ -1,3 +1,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
diff --git a/validate/data/adaptive_video_framerate_size.scenario b/validate/data/adaptive_video_framerate_size.scenario
index 691af4c..2289671 100644
--- a/validate/data/adaptive_video_framerate_size.scenario
+++ b/validate/data/adaptive_video_framerate_size.scenario
@@ -1,3 +1,4 @@
+description, duration=25.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,height=20,width=20,framerate=(fraction)5/1"
set-restriction, playback_time=15.0, restriction-caps="video/x-raw,height=20,width=20,framerate=(fraction)30/1"
diff --git a/validate/data/adaptive_video_size.scenario b/validate/data/adaptive_video_size.scenario
index 9dbe5e9..5cbb283 100644
--- a/validate/data/adaptive_video_size.scenario
+++ b/validate/data/adaptive_video_size.scenario
@@ -1,3 +1,4 @@
-set-restriction, playback_time=5.0, restriction-caps="video/x-raw,height=20,width=20"
+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
diff --git a/validate/data/alternate_fast_backward_forward.scenario b/validate/data/alternate_fast_backward_forward.scenario
index 3da17c2..fac239d 100644
--- a/validate/data/alternate_fast_backward_forward.scenario
+++ b/validate/data/alternate_fast_backward_forward.scenario
@@ -1,12 +1,13 @@
+description, duration=55.0, min-media-duration=470.0, seek=true, reverse-playback=true
seek, name=backward-seek, playback_time=0.0, rate=-1.0, start=0.0, stop=310.0, flags=accurate+flush
seek, name=forward-seek, playback_time=305.0, rate=1.0, start=305.0, flags=accurate+flush
seek, name=Fast-forward-seek, playback_time=310.0, rate=2.0, start=310.0, flags=accurate+flush
seek, name=Fast-backward-seek, playback_time=320.0, rate=-2.0, start=0.0, stop=320.0, flags=accurate+flush
seek, name=Fast-forward-seek, playback_time=310.0, rate=4.0, start=310.0, flags=accurate+flush
seek, name=Fast-backward-seek, playback_time=330.0, rate=-4.0, start=0.0, stop=330.0, flags=accurate+flush
-seek, name=Fast-forward-seek, playback_time=310.0, rate=8.0, start=310.0,, flags=accurate+flush
+seek, name=Fast-forward-seek, playback_time=310.0, rate=8.0, start=310.0, flags=accurate+flush
seek, name=Fast-backward-seek, playback_time=350.0, rate=-8.0, start=0.0, stop=350.0, flags=accurate+flush
seek, name=Fast-forward-seek, playback_time=310.0, rate=16.0, start=310.0, flags=accurate+flush
seek, name=Fast-backward-seek, playback_time=390.0, rate=-16.0, start=0.0, stop=390.0, flags=accurate+flush
-seek, name=Fast-forward-seek, playback_time=310.0, rate=32.0, start=310.0,, flags=accurate+flush
+seek, name=Fast-forward-seek, playback_time=310.0, rate=32.0, start=310.0, flags=accurate+flush
seek, name=Fast-backward-seek, playback_time=470.0, rate=-32.0, start=310.0, stop=470.0, flags=accurate+flush
diff --git a/validate/data/fast_backward.scenario b/validate/data/fast_backward.scenario
index 65f49f6..2c6d0ed 100644
--- a/validate/data/fast_backward.scenario
+++ b/validate/data/fast_backward.scenario
@@ -1,3 +1,4 @@
+description, duration=30.0, minfo-media-duration=310.0, seek=true, reverse-playback=true
seek, name=Fast-backward-seek, playback_time=0.0, rate=-2.0, start=0.0, stop=310.0, flags=accurate+flush
seek, name=Fast-backward-seek, playback_time=300.0, rate=-4.0, start=0.0, stop=300.0, flags=accurate+flush
seek, name=Fast-backward-seek, playback_time=280.0, rate=-8.0, start=0.0, stop=280.0, flags=accurate+flush
diff --git a/validate/data/fast_forward.scenario b/validate/data/fast_forward.scenario
index e390b63..41c87d9 100644
--- a/validate/data/fast_forward.scenario
+++ b/validate/data/fast_forward.scenario
@@ -1,3 +1,4 @@
+description, duration=35.0, seek=true
seek, name=Fast-forward-seek, playback_time=0.0, rate=2.0, start=0.0, flags=accurate+flush
seek, name=Fast-forward-seek, playback_time="min(10.0, duration*0.25)", rate=4.0, start=0.0, flags=accurate+flush
seek, name=Fast-forward-seek, playback_time="min(20.0, duration*0.50)", rate=8.0, start=0.0, flags=accurate+flush
diff --git a/validate/data/force_key_unit.scenario b/validate/data/force_key_unit.scenario
index 65b154f..bd14dca 100644
--- a/validate/data/force_key_unit.scenario
+++ b/validate/data/force_key_unit.scenario
@@ -1,2 +1,3 @@
+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
diff --git a/validate/data/pause_resume.scenario b/validate/data/pause_resume.scenario
index 918d663..4f1faa5 100644
--- a/validate/data/pause_resume.scenario
+++ b/validate/data/pause_resume.scenario
@@ -1,3 +1,4 @@
+description, duration=14.0, min-media-duration=7.0
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
diff --git a/validate/data/play_15s.scenario b/validate/data/play_15s.scenario
index 363d7fd..13d36af 100644
--- a/validate/data/play_15s.scenario
+++ b/validate/data/play_15s.scenario
@@ -1 +1,2 @@
-eos, playback_time="min(duration - 1, 15.0)"
+description, duration=15.0
+eos, playback_time=15.0
diff --git a/validate/data/reverse_playback.scenario b/validate/data/reverse_playback.scenario
index 3cd964f..70ec54a 100644
--- a/validate/data/reverse_playback.scenario
+++ b/validate/data/reverse_playback.scenario
@@ -1 +1,2 @@
+description, seek=true, reverse-playback=true
seek, name=Revserse-seek, playback_time=0.0, rate=-1.0, start=0.0, stop=duration, flags=accurate+flush
diff --git a/validate/data/scrub_forward_seeking.scenario b/validate/data/scrub_forward_seeking.scenario
index 947cf55..45c93c6 100644
--- a/validate/data/scrub_forward_seeking.scenario
+++ b/validate/data/scrub_forward_seeking.scenario
@@ -1,3 +1,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
diff --git a/validate/data/seek_backward.scenario b/validate/data/seek_backward.scenario
index 1b00a9b..995f851 100644
--- a/validate/data/seek_backward.scenario
+++ b/validate/data/seek_backward.scenario
@@ -1,3 +1,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
diff --git a/validate/data/seek_forward.scenario b/validate/data/seek_forward.scenario
index 80d12b9..3740d74 100644
--- a/validate/data/seek_forward.scenario
+++ b/validate/data/seek_forward.scenario
@@ -1,3 +1,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
diff --git a/validate/data/seek_forward_backward.scenario b/validate/data/seek_forward_backward.scenario
index e10b199..cc7b6a8 100644
--- a/validate/data/seek_forward_backward.scenario
+++ b/validate/data/seek_forward_backward.scenario
@@ -1,3 +1,4 @@
+description, seek=true, duration=40
seek, name=Forward-seek, playback_time=0.0, rate=1.0, start=5.0, flags=accurate+flush
seek, name=Backward-seek, playback_time=10.0, rate=1.0, start=0.0, flags=accurate+flush
seek, name=Backward-seek, playback_time=5.0, rate=1.0, start=25.0, stop=-1, flags=accurate+flush
@@ -5,4 +6,4 @@ seek, name=Backward-seek, playback_time=30.0, rate=1.0, start=0.0,
seek, name=Forward-seek, playback_time=5.0, rate=1.0, start=15.0, flags=accurate+flush
seek, name=Forward-seek, playback_time=20.0, rate=1.0, start=35.0, flags=accurate+flush
seek, name=Backward-seek, playback_time=40.0, rate=1.0, start=25.0, flags=accurate+flush
-seek, name=Last-backward-seek, playback_time=3.0, rate=1.0, start=5.0, stop=10.0, flags=accurate+flush
+seek, name=Last-backward-seek, playback_time=30.0, rate=1.0, start=5.0, stop=10.0, flags=accurate+flush
diff --git a/validate/data/seek_with_stop.scenario b/validate/data/seek_with_stop.scenario
index 5ddaead..b55c970 100644
--- a/validate/data/seek_with_stop.scenario
+++ b/validate/data/seek_with_stop.scenario
@@ -1 +1,2 @@
+description, seek=true, duration=5.0
seek, playback_time=1.0, start=0.0, stop="min(5.0, duration-1.0)", flags=accurate+flush
diff --git a/validate/data/simple_seeks.scenario b/validate/data/simple_seeks.scenario
index c267f5c..22bcb50 100644
--- a/validate/data/simple_seeks.scenario
+++ b/validate/data/simple_seeks.scenario
@@ -1,3 +1,4 @@
+description, seek=true, duration=5.0
seek, playback_time=1.0, rate=1.0, start=2.0, flags=accurate+flush
seek, playback_time=3.0, rate=1.0, start=0.0, flags=accurate+flush
seek, playback_time=1.0, rate=1.0, start=2.0, stop=3.0, flags=accurate+flush
diff --git a/validate/data/switch_audio_track.scenario b/validate/data/switch_audio_track.scenario
index 427de5b..61802c7 100644
--- a/validate/data/switch_audio_track.scenario
+++ b/validate/data/switch_audio_track.scenario
@@ -1 +1,2 @@
+description, summary="Change audio track at 5 second to the second audio track"
switch-track, name=Next-audio-track, playback_time=5.0, type=audio, index=(string)+1
diff --git a/validate/data/update_start.scenario b/validate/data/update_start.scenario
index 6fb8657..9065843 100644
--- a/validate/data/update_start.scenario
+++ b/validate/data/update_start.scenario
@@ -1 +1,2 @@
+description, summary="Use the set seek type to seek at 5 seconds after 2 seconds", seek=true
seek, playback_time=2.0, rate=1.0, start_type=set, start=5.0, stop_type=none, stop=0.0, flags=accurate+flush
diff --git a/validate/data/update_stop.scenario b/validate/data/update_stop.scenario
index d3ef2fa..d0aa9c7 100644
--- a/validate/data/update_stop.scenario
+++ b/validate/data/update_stop.scenario
@@ -1 +1,3 @@
+description, summary="Use the set seek type to seek at 0 secs stop 10secs after 5 secs", seek=true
+description, duration=15.0, seeks=true
seek, playback_time=5.0, rate=1.0, start_type=none, start=0.0, stop_type=set, stop=10.0, flags=accurate+flush