From 99045f7dbb0e59c794596b66fa6edb2f4f5624d0 Mon Sep 17 00:00:00 2001 From: Thibault Saunier Date: Sun, 12 Oct 2014 20:19:42 +0200 Subject: [PATCH] validate: Rename action type playback_time to playback-time Keeping backward compatiblity with the old naming --- .../data/adaptive_video_framerate.scenario | 8 +++---- .../adaptive_video_framerate_size.scenario | 12 +++++----- validate/data/adaptive_video_size.scenario | 8 +++---- .../alternate_fast_backward_forward.scenario | 24 +++++++++---------- validate/data/camerabin_signal.scenario | 4 ++-- ...sable_subtitle_track_while_paused.scenario | 2 +- validate/data/fast_backward.scenario | 10 ++++---- validate/data/fast_forward.scenario | 12 +++++----- validate/data/force_key_unit.scenario | 6 ++--- validate/data/pause_resume.scenario | 10 ++++---- validate/data/play_15s.scenario | 4 ++-- validate/data/reverse_playback.scenario | 2 +- validate/data/scrub_backward_seeking.scenario | 10 ++++---- validate/data/scrub_forward_seeking.scenario | 8 +++---- validate/data/seek_backward.scenario | 8 +++---- validate/data/seek_forward.scenario | 8 +++---- validate/data/seek_forward_backward.scenario | 16 ++++++------- validate/data/seek_with_stop.scenario | 2 +- validate/data/simple_seeks.scenario | 6 ++--- validate/data/switch_audio_track.scenario | 4 ++-- .../switch_audio_track_while_paused.scenario | 4 ++-- validate/data/switch_subtitle_track.scenario | 4 ++-- ...witch_subtitle_track_while_paused.scenario | 2 +- validate/data/update_start.scenario | 2 +- validate/data/update_stop.scenario | 2 +- validate/docs/validate/scenarios.xml | 8 +++---- validate/gst/validate/gst-validate-scenario.c | 13 ++++++---- 27 files changed, 101 insertions(+), 98 deletions(-) diff --git a/validate/data/adaptive_video_framerate.scenario b/validate/data/adaptive_video_framerate.scenario index 9441bc27c9..a3043af083 100644 --- a/validate/data/adaptive_video_framerate.scenario +++ b/validate/data/adaptive_video_framerate.scenario @@ -1,5 +1,5 @@ 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 +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 eb6013b4cf..d5cf5963aa 100644 --- a/validate/data/adaptive_video_framerate_size.scenario +++ b/validate/data/adaptive_video_framerate_size.scenario @@ -1,7 +1,7 @@ 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" -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 +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" +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 315af9130e..c3b5d2ef98 100644 --- a/validate/data/adaptive_video_size.scenario +++ b/validate/data/adaptive_video_size.scenario @@ -1,5 +1,5 @@ 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 +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/alternate_fast_backward_forward.scenario b/validate/data/alternate_fast_backward_forward.scenario index fac239deb7..328a96ac85 100644 --- a/validate/data/alternate_fast_backward_forward.scenario +++ b/validate/data/alternate_fast_backward_forward.scenario @@ -1,13 +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-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-backward-seek, playback_time=470.0, rate=-32.0, start=310.0, stop=470.0, flags=accurate+flush +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-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-backward-seek, playback-time=470.0, rate=-32.0, start=310.0, stop=470.0, flags=accurate+flush diff --git a/validate/data/camerabin_signal.scenario b/validate/data/camerabin_signal.scenario index 74dfe42141..55c0704a02 100644 --- a/validate/data/camerabin_signal.scenario +++ b/validate/data/camerabin_signal.scenario @@ -1,4 +1,4 @@ description, duration=20.0 -emit-signal, target-element-name=camerabin0, signal-name=start-capture, playback_time=10.0 -eos, playback_time=20.0 +emit-signal, target-element-name=camerabin0, signal-name=start-capture, playback-time=10.0 +eos, playback-time=20.0 diff --git a/validate/data/disable_subtitle_track_while_paused.scenario b/validate/data/disable_subtitle_track_while_paused.scenario index e1f2a40704..abd8f6c1bd 100644 --- a/validate/data/disable_subtitle_track_while_paused.scenario +++ b/validate/data/disable_subtitle_track_while_paused.scenario @@ -3,4 +3,4 @@ pause; switch-track, name="Disable subtitle", type=text, disable=true wait, duration=0.5 play; -stop, playback_time=2.0 +stop, playback-time=2.0 diff --git a/validate/data/fast_backward.scenario b/validate/data/fast_backward.scenario index f1fc1e45c5..71f6f569f9 100644 --- a/validate/data/fast_backward.scenario +++ b/validate/data/fast_backward.scenario @@ -1,6 +1,6 @@ description, duration=30.0, minfo-media-duration=310.0, seek=true, reverse-playback=true, need-clock-sync=true, min-media-duration=310.0 -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 -seek, name=Fast-backward-seek, playback_time=240.0, rate=-16.0, start=0.0, stop=240.0, flags=accurate+flush -seek, name=Fast-backward-seek, playback_time=160.0, rate=-32.0, start=0.0, stop=160.0, flags=accurate+flush +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 +seek, name=Fast-backward-seek, playback-time=240.0, rate=-16.0, start=0.0, stop=240.0, flags=accurate+flush +seek, name=Fast-backward-seek, playback-time=160.0, rate=-32.0, start=0.0, stop=160.0, flags=accurate+flush diff --git a/validate/data/fast_forward.scenario b/validate/data/fast_forward.scenario index f8ab9b24d3..1f24383b23 100644 --- a/validate/data/fast_forward.scenario +++ b/validate/data/fast_forward.scenario @@ -1,7 +1,7 @@ description, duration=35.0, seek=true, need-clock-sync=true, min-media-duration=5.0 -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 -seek, name=Fast-forward-seek, playback_time="min(40.0, duration*0.75)", rate=16.0, start=0.0, flags=accurate+flush -seek, name=Fast-forward-seek, playback_time="min(50.0, duration*0.75)", rate=32.0, start=0.0, flags=accurate+flush -stop, playback_time="min(duration - 0.3, 60.0)" +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 +seek, name=Fast-forward-seek, playback-time="min(40.0, duration*0.75)", rate=16.0, start=0.0, flags=accurate+flush +seek, name=Fast-forward-seek, playback-time="min(50.0, duration*0.75)", rate=32.0, start=0.0, flags=accurate+flush +stop, playback-time="min(duration - 0.3, 60.0)" diff --git a/validate/data/force_key_unit.scenario b/validate/data/force_key_unit.scenario index ba4185d2e2..2a9c8394de 100644 --- a/validate/data/force_key_unit.scenario +++ b/validate/data/force_key_unit.scenario @@ -1,4 +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 +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 3bbb9100e6..27bfc10909 100644 --- a/validate/data/pause_resume.scenario +++ b/validate/data/pause_resume.scenario @@ -1,6 +1,6 @@ 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 -eos, name=Done-testing, playback_time=7.0 -stop, playback_time=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 +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 28eb80e87f..af86cb35f2 100644 --- a/validate/data/play_15s.scenario +++ b/validate/data/play_15s.scenario @@ -1,3 +1,3 @@ description, duration=15.0 -eos, playback_time=15.0 -stop, playback_time=15.0 +eos, playback-time=15.0 +stop, playback-time=15.0 diff --git a/validate/data/reverse_playback.scenario b/validate/data/reverse_playback.scenario index 70ec54acfc..45e4834b8d 100644 --- a/validate/data/reverse_playback.scenario +++ b/validate/data/reverse_playback.scenario @@ -1,2 +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 +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_backward_seeking.scenario b/validate/data/scrub_backward_seeking.scenario index b757c7990c..866a536b84 100644 --- a/validate/data/scrub_backward_seeking.scenario +++ b/validate/data/scrub_backward_seeking.scenario @@ -1,7 +1,7 @@ description, seek=true -pause, playback_time=0.0 -seek, playback_time=0.0, start="duration - 0.5", flags=accurate+flush -seek, playback_time=0.0, start=position-0.1, repeat="min(10, (duration - 0.6))/0.1", flags=accurate+flush -play, playback_time=0.0 -stop, playback_time=1.0 +pause, playback-time=0.0 +seek, playback-time=0.0, start="duration - 0.5", flags=accurate+flush +seek, playback-time=0.0, start=position-0.1, repeat="min(10, (duration - 0.6))/0.1", flags=accurate+flush +play, playback-time=0.0 +stop, playback-time=1.0 diff --git a/validate/data/scrub_forward_seeking.scenario b/validate/data/scrub_forward_seeking.scenario index 5be7b3736d..e7b16ffad0 100644 --- a/validate/data/scrub_forward_seeking.scenario +++ b/validate/data/scrub_forward_seeking.scenario @@ -1,5 +1,5 @@ description, seek=true, handles-states=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 -stop, playback_time=1.0 +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 +stop, playback-time=1.0 diff --git a/validate/data/seek_backward.scenario b/validate/data/seek_backward.scenario index 5083c9b590..9cd2df3678 100644 --- a/validate/data/seek_backward.scenario +++ b/validate/data/seek_backward.scenario @@ -1,5 +1,5 @@ description, seek=true, duration=30, need-clock-sync=true -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 -stop, playback_time="min(15.0, 3*(duration/4))" +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 +stop, playback-time="min(15.0, 3*(duration/4))" diff --git a/validate/data/seek_forward.scenario b/validate/data/seek_forward.scenario index 1487cc9bb9..1b907c8ae8 100644 --- a/validate/data/seek_forward.scenario +++ b/validate/data/seek_forward.scenario @@ -1,5 +1,5 @@ description, seek=true, duration=20, need-clock-sync=true -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 -stop, playback_time=35.0 +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 +stop, playback-time=35.0 diff --git a/validate/data/seek_forward_backward.scenario b/validate/data/seek_forward_backward.scenario index cc7b6a813a..db0618c02f 100644 --- a/validate/data/seek_forward_backward.scenario +++ b/validate/data/seek_forward_backward.scenario @@ -1,9 +1,9 @@ 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 -seek, name=Backward-seek, playback_time=30.0, rate=1.0, start=0.0, flags=accurate+flush -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=30.0, rate=1.0, start=5.0, stop=10.0, flags=accurate+flush +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 +seek, name=Backward-seek, playback-time=30.0, rate=1.0, start=0.0, flags=accurate+flush +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=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 b55c9700b4..c0f3e1b99a 100644 --- a/validate/data/seek_with_stop.scenario +++ b/validate/data/seek_with_stop.scenario @@ -1,2 +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 +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 22bcb50d82..645253a0d6 100644 --- a/validate/data/simple_seeks.scenario +++ b/validate/data/simple_seeks.scenario @@ -1,4 +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 +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 5548341d40..5669d6eaae 100644 --- a/validate/data/switch_audio_track.scenario +++ b/validate/data/switch_audio_track.scenario @@ -1,3 +1,3 @@ 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 +switch-track, name=Next-audio-track, playback-time=5.0, type=audio, index=(string)+1 +stop, playback-time=10.0 diff --git a/validate/data/switch_audio_track_while_paused.scenario b/validate/data/switch_audio_track_while_paused.scenario index a8c15b65c0..30fc6b672b 100644 --- a/validate/data/switch_audio_track_while_paused.scenario +++ b/validate/data/switch_audio_track_while_paused.scenario @@ -1,5 +1,5 @@ description, summary="Change audio track while pipeline is paused", min-audio-track=2, duration=6.0, need-clock-sync=true -pause, playback_time=1.0; +pause, playback-time=1.0; # Wait so that humans can see the pipeline is paused wait, duration=0.5 @@ -8,4 +8,4 @@ switch-track, name=Next-audio-track, type=audio, index=(string)+1 # Wait so that humans can see the pipeline is paused wait, duration=0.5 play; -stop, playback_time=5.0 +stop, playback-time=5.0 diff --git a/validate/data/switch_subtitle_track.scenario b/validate/data/switch_subtitle_track.scenario index 0ba7ed30bf..83ce3d651d 100644 --- a/validate/data/switch_subtitle_track.scenario +++ b/validate/data/switch_subtitle_track.scenario @@ -1,3 +1,3 @@ description, summary="Change subtitle track at 1 second while playing back", min-subtitle-track=2, duration=5.0 -switch-track, playback_time=1.0, type=text, index=(string)+1 -stop, playback_time=5.0 +switch-track, playback-time=1.0, type=text, index=(string)+1 +stop, playback-time=5.0 diff --git a/validate/data/switch_subtitle_track_while_paused.scenario b/validate/data/switch_subtitle_track_while_paused.scenario index 6add0f1e9d..15c4ec71be 100644 --- a/validate/data/switch_subtitle_track_while_paused.scenario +++ b/validate/data/switch_subtitle_track_while_paused.scenario @@ -4,4 +4,4 @@ wait, duration=0.5 switch-track, type=text, index=(string)+1 wait, duration=0.5 play; -stop, playback_time=5.0 +stop, playback-time=5.0 diff --git a/validate/data/update_start.scenario b/validate/data/update_start.scenario index 9065843c87..54456fd541 100644 --- a/validate/data/update_start.scenario +++ b/validate/data/update_start.scenario @@ -1,2 +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 +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 d0aa9c7099..cb237d940c 100644 --- a/validate/data/update_stop.scenario +++ b/validate/data/update_stop.scenario @@ -1,3 +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 +seek, playback-time=5.0, rate=1.0, start_type=none, start=0.0, stop_type=set, stop=10.0, flags=accurate+flush diff --git a/validate/docs/validate/scenarios.xml b/validate/docs/validate/scenarios.xml index b4195de4f5..2fa55496ab 100644 --- a/validate/docs/validate/scenarios.xml +++ b/validate/docs/validate/scenarios.xml @@ -39,7 +39,7 @@ - seek, playback_time=10.0, start=0.0, flags=accurate+flush + seek, playback-time=10.0, start=0.0, flags=accurate+flush @@ -74,9 +74,9 @@ 3.0 to 0.0 and then seeks at \ 1.0 to 2.0 for 1.0 second (between 2.0 and 3.0).", \ seek=true, duration=5.0, min-media-duration=4.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 + 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/gst/validate/gst-validate-scenario.c b/validate/gst/validate/gst-validate-scenario.c index e0fb4d2282..e6d575367b 100644 --- a/validate/gst/validate/gst-validate-scenario.c +++ b/validate/gst/validate/gst-validate-scenario.c @@ -1148,10 +1148,10 @@ message_cb (GstBus * bus, GstMessage * message, GstValidateScenario * scenario) GstValidateAction *action = tmp->data; if (!gst_validate_action_get_clocktime (scenario, action, - "playback_time", &action->playback_time)) { + "playback-time", &action->playback_time)) { gchar *str = gst_structure_to_string (action->structure); - g_error ("Could not parse playback_time on structure: %s", str); + g_error ("Could not parse playback-time on structure: %s", str); g_free (str); return FALSE; @@ -1436,9 +1436,12 @@ _load_scenario_file (GstValidateScenario * scenario, action = gst_validate_action_new (); action->type = type; action->repeat = -1; - if (gst_structure_get_double (structure, "playback_time", &playback_time)) { + if (gst_structure_get_double (structure, "playback-time", &playback_time) || + gst_structure_get_double (structure, "playback_time", &playback_time)) { action->playback_time = playback_time * GST_SECOND; } else if ((str_playback_time = + gst_structure_get_string (structure, "playback-time")) || + (str_playback_time = gst_structure_get_string (structure, "playback_time"))) { priv->needs_parsing = g_list_append (priv->needs_parsing, action); } else @@ -1941,7 +1944,7 @@ gst_validate_register_action_type (const gchar * type_name, } if (!is_config) { - type->parameters[n_params - 1].name = "playback_time"; + type->parameters[n_params - 1].name = "playback-time"; type->parameters[n_params - 1].description = "The playback time at which the action " "will be executed"; type->parameters[n_params - 1].mandatory = FALSE; @@ -2185,7 +2188,7 @@ init_scenarios (void) }), "Seeks into the stream, example of a seek happening when the stream reaches 5 seconds\n" "or 1 eighth of its duration and seeks at 10sec or 2 eighth of its duration:\n" - " seek, playback_time=\"min(5.0, (duration/8))\", start=\"min(10, 2*(duration/8))\", flags=accurate+flush", + " seek, playback-time=\"min(5.0, (duration/8))\", start=\"min(10, 2*(duration/8))\", flags=accurate+flush", FALSE );