From 96d1df3cb74c791e18cb25869840c0a30c1ef222 Mon Sep 17 00:00:00 2001 From: Guillaume Desmottes Date: Fri, 5 Jun 2020 15:56:00 +0200 Subject: [PATCH] tests: enforce I420 format Tests are assuming video is I420 with a specific chroma and colorimetry but were not actually enforcing it. Fixes needed as I420 will no longer be the first video format, see gst-plugins-base!689 Part-of: --- tests/check/scenarios/edit_while_seeked_with_stop.validatetest | 2 +- .../flow-expectations/log-videosink-sink-expected | 3 --- .../scenarios/seek_with_stop.check_clock_sync.validatetest | 2 +- tests/check/scenarios/seek_with_stop.validatetest | 1 + 4 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/check/scenarios/edit_while_seeked_with_stop.validatetest b/tests/check/scenarios/edit_while_seeked_with_stop.validatetest index a401abab62..0a96beefed 100644 --- a/tests/check/scenarios/edit_while_seeked_with_stop.validatetest +++ b/tests/check/scenarios/edit_while_seeked_with_stop.validatetest @@ -3,7 +3,7 @@ meta, args = { --track-types, video, --videosink, "$(videosink) name=videosink", - --video-caps, "video/x-raw,width=1280,height=720,framerate=10/1", + --video-caps, "video/x-raw,format=I420,width=1280,height=720,framerate=10/1,chroma-site=mpeg2,colorimetry=bt709", }, handles-states=true, ignore-eos=true, diff --git a/tests/check/scenarios/edit_while_seeked_with_stop/flow-expectations/log-videosink-sink-expected b/tests/check/scenarios/edit_while_seeked_with_stop/flow-expectations/log-videosink-sink-expected index e6bdcebc0a..4004ae525a 100644 --- a/tests/check/scenarios/edit_while_seeked_with_stop/flow-expectations/log-videosink-sink-expected +++ b/tests/check/scenarios/edit_while_seeked_with_stop/flow-expectations/log-videosink-sink-expected @@ -17,7 +17,6 @@ buffer: pts=0:00:00.400000000, dur=0:00:00.100000000 event eos: (no structure) event flush-start: (no structure) event flush-stop: GstEventFlushStop, reset-time=(boolean)true; -event caps: video/x-raw, format=(string)I420, width=(int)1280, height=(int)720, framerate=(fraction)10/1, chroma-site=(string)jpeg, colorimetry=(string)bt601; event segment: format=TIME, start=0:00:00.500000000, offset=0:00:00.000000000, stop=0:00:01.000000000, flags=0x01, time=0:00:00.500000000, base=0:00:00.000000000, position=none buffer: pts=0:00:00.500000000, dur=0:00:00.100000000 event flush-start: (no structure) @@ -31,7 +30,6 @@ buffer: pts=0:00:00.900000000, dur=0:00:00.100000000 event eos: (no structure) event flush-start: (no structure) event flush-stop: GstEventFlushStop, reset-time=(boolean)true; -event caps: video/x-raw, format=(string)I420, width=(int)1280, height=(int)720, framerate=(fraction)10/1, chroma-site=(string)mpeg2, colorimetry=(string)bt709; event segment: format=TIME, start=0:00:01.000000000, offset=0:00:00.000000000, stop=0:00:01.000000000, flags=0x01, time=0:00:01.000000000, base=0:00:00.000000000, position=none event eos: (no structure) event flush-start: (no structure) @@ -46,7 +44,6 @@ buffer: pts=0:00:01.100000000, dur=0:00:00.100000000 buffer: pts=0:00:01.200000000, dur=0:00:00.100000000 buffer: pts=0:00:01.300000000, dur=0:00:00.100000000 buffer: pts=0:00:01.400000000, dur=0:00:00.100000000 -event caps: video/x-raw, format=(string)I420, width=(int)1280, height=(int)720, framerate=(fraction)10/1, chroma-site=(string)jpeg, colorimetry=(string)bt601; event segment: format=TIME, start=0:00:01.500000000, offset=0:00:00.000000000, stop=0:00:01.500000001, flags=0x01, time=0:00:01.500000000, base=0:00:00.500000000, position=none buffer: pts=0:00:01.500000000, dur=0:00:00.000000001 event eos: (no structure) diff --git a/tests/check/scenarios/seek_with_stop.check_clock_sync.validatetest b/tests/check/scenarios/seek_with_stop.check_clock_sync.validatetest index a082a58277..0c679364b9 100644 --- a/tests/check/scenarios/seek_with_stop.check_clock_sync.validatetest +++ b/tests/check/scenarios/seek_with_stop.check_clock_sync.validatetest @@ -3,7 +3,7 @@ meta, args = { --track-types, video, --videosink, "$(videosink) name=videosink", - --video-caps, "video/x-raw,width=1280,height=720,framerate=10/1", + --video-caps, "video/x-raw,format=I420,width=1280,height=720,framerate=10/1,chroma-site=mpeg2,colorimetry=bt709;", }, handles-states=true, ignore-eos=true, diff --git a/tests/check/scenarios/seek_with_stop.validatetest b/tests/check/scenarios/seek_with_stop.validatetest index 6f4098b0f1..582d0a47e3 100644 --- a/tests/check/scenarios/seek_with_stop.validatetest +++ b/tests/check/scenarios/seek_with_stop.validatetest @@ -3,6 +3,7 @@ meta, args = { --videosink, "$(videosink) sync=false name=videosink", --audiosink, "$(audiosink) sync=false name=audiosink", + --video-caps, "video/x-raw,format=I420,width=1280,height=720,framerate=30/1,chroma-site=mpeg2,colorimetry=bt709", }, handles-states=true, ignore-eos=true,