summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Desmottes <guillaume.desmottes@collabora.com>2020-06-08 13:16:09 +0200
committerGuillaume Desmottes <guillaume.desmottes@collabora.com>2020-06-08 17:38:22 +0200
commitd3aca1b419fbb41cc3be8b5f396a92d75fddfc1d (patch)
tree296f2409e37eb064ed03ca15192117a528b80aa1
parent80f1e182bdeafe9034227a8306818f01291296e0 (diff)
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: <https://gitlab.freedesktop.org/gstreamer/gst-integration-testsuites/-/merge_requests/81>
-rw-r--r--ges/scenarios/edit_deeply_nested_timeline_too_short.validatetest3
-rw-r--r--ges/scenarios/edit_deeply_nested_timeline_too_short/flow-expectations/log-videosink-sink-expected1
-rw-r--r--ges/scenarios/play_deeply_nested_back_to_back.validatetest2
-rw-r--r--ges/scenarios/play_deeply_nested_back_to_back/flow-expectations/log-videosink-sink-expected3
-rw-r--r--ges/scenarios/play_two_nested_back_to_back.validatetest2
-rw-r--r--ges/scenarios/play_two_nested_back_to_back/flow-expectations/log-videosink-sink-expected3
-rw-r--r--testsuites/validate/interlace/interlace_deinterlace.validatetest2
-rw-r--r--testsuites/validate/interlace/interlace_deinterlace_alternate.validatetest2
8 files changed, 8 insertions, 10 deletions
diff --git a/ges/scenarios/edit_deeply_nested_timeline_too_short.validatetest b/ges/scenarios/edit_deeply_nested_timeline_too_short.validatetest
index cd43799..c168e25 100644
--- a/ges/scenarios/edit_deeply_nested_timeline_too_short.validatetest
+++ b/ges/scenarios/edit_deeply_nested_timeline_too_short.validatetest
@@ -7,6 +7,7 @@ meta,
args = {
"--track-type=video",
--videosink, "$(videosink) name=videosink",
+ --video-caps, "video/x-raw,format=I420,chroma-site=mpeg2,colorimetry=bt709",
},
configs = {
"$(validateflow), pad=videosink:sink, record-buffers=true, ignored-fields=\"stream-start={stream-id,group-id,stream}\"",
@@ -17,7 +18,7 @@ set-vars,
nested_timeline_depth2_uri="file://$(logsdir)/ges/scenarios/$(test_name)/nested_timeline_depth2.xges",
project_uri="file://$(logsdir)/ges/scenarios/$(test_name)/project.xges"
-set-track-restriction-caps, track-type="video", caps="video/x-raw,width=1080,height=720"
+set-track-restriction-caps, track-type="video", caps="video/x-raw,width=1080,height=720,format=I420"
# Make sure the asset ID is the project_uri and serialize the empty timeline for each nested projects uris
serialize-project, uri="$(project_uri)"
serialize-project, uri="$(nested_timeline_uri)"
diff --git a/ges/scenarios/edit_deeply_nested_timeline_too_short/flow-expectations/log-videosink-sink-expected b/ges/scenarios/edit_deeply_nested_timeline_too_short/flow-expectations/log-videosink-sink-expected
index 7079a92..a1cc60a 100644
--- a/ges/scenarios/edit_deeply_nested_timeline_too_short/flow-expectations/log-videosink-sink-expected
+++ b/ges/scenarios/edit_deeply_nested_timeline_too_short/flow-expectations/log-videosink-sink-expected
@@ -43,7 +43,6 @@ buffer: pts=0:00:03.866666667, dur=0:00:00.033333333
buffer: pts=0:00:03.900000000, dur=0:00:00.033333333
buffer: pts=0:00:03.933333333, dur=0:00:00.033333334
buffer: pts=0:00:03.966666667, dur=0:00:00.033333333
-event caps: video/x-raw, format=(string)I420, width=(int)1080, height=(int)720, framerate=(fraction)30/1, chroma-site=(string)jpeg, colorimetry=(string)bt601;
event segment: format=TIME, start=0:00:04.000000000, offset=0:00:00.000000000, stop=0:00:04.000000001, flags=0x01, time=0:00:04.000000000, base=0:00:01.000000000, position=none
buffer: pts=0:00:04.000000000, dur=0:00:00.000000001
event eos: (no structure)
diff --git a/ges/scenarios/play_deeply_nested_back_to_back.validatetest b/ges/scenarios/play_deeply_nested_back_to_back.validatetest
index 2a857fc..fba6338 100644
--- a/ges/scenarios/play_deeply_nested_back_to_back.validatetest
+++ b/ges/scenarios/play_deeply_nested_back_to_back.validatetest
@@ -4,7 +4,7 @@ meta,
tool = "ges-launch-$(gst_api_version)",
args = {
--track-types, video,
- --video-caps, "video/x-raw, format=(string)I420, width=(int)1080, height=(int)720, framerate=(fraction)1/1",
+ --video-caps, "video/x-raw, format=(string)I420, width=(int)1080, height=(int)720, framerate=(fraction)1/1, chroma-site=(string)jpeg, colorimetry=(string)bt601",
--videosink, "$(videosink) name=videosink",
},
configs = {
diff --git a/ges/scenarios/play_deeply_nested_back_to_back/flow-expectations/log-videosink-sink-expected b/ges/scenarios/play_deeply_nested_back_to_back/flow-expectations/log-videosink-sink-expected
index b3eaa01..5f0af92 100644
--- a/ges/scenarios/play_deeply_nested_back_to_back/flow-expectations/log-videosink-sink-expected
+++ b/ges/scenarios/play_deeply_nested_back_to_back/flow-expectations/log-videosink-sink-expected
@@ -1,12 +1,11 @@
event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE;
-event caps: video/x-raw, format=(string)I420, width=(int)1080, height=(int)720, framerate=(fraction)1/1, chroma-site=(string)jpeg, colorimetry=(string)1:4:0:0;
+event caps: video/x-raw, format=(string)I420, width=(int)1080, height=(int)720, framerate=(fraction)1/1, chroma-site=(string)jpeg, colorimetry=(string)bt601;
event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:02.000000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000, position=none
buffer: checksum=68cc0c0b6d6863a135f40297a54aec9f1593f34c, pts=0:00:00.000000000, dur=0:00:01.000000000
buffer: checksum=9b42849e45e15981115cff9da00ecbf7afafd462, pts=0:00:01.000000000, dur=0:00:01.000000000
event segment: format=TIME, start=0:00:02.000000000, offset=0:00:00.000000000, stop=0:00:04.000000000, flags=0x01, time=0:00:02.000000000, base=0:00:02.000000000, position=none
buffer: checksum=68cc0c0b6d6863a135f40297a54aec9f1593f34c, pts=0:00:02.000000000, dur=0:00:01.000000000
buffer: checksum=9b42849e45e15981115cff9da00ecbf7afafd462, pts=0:00:03.000000000, dur=0:00:01.000000000
-event caps: video/x-raw, format=(string)I420, width=(int)1080, height=(int)720, framerate=(fraction)1/1, chroma-site=(string)jpeg, colorimetry=(string)bt601;
event segment: format=TIME, start=0:00:04.000000000, offset=0:00:00.000000000, stop=0:00:04.000000001, flags=0x01, time=0:00:04.000000000, base=0:00:04.000000000, position=none
buffer: checksum=b13fcbc51ceae3d11232a95b192760d61baf4748, pts=0:00:04.000000000, dur=0:00:00.000000001
event eos: (no structure)
diff --git a/ges/scenarios/play_two_nested_back_to_back.validatetest b/ges/scenarios/play_two_nested_back_to_back.validatetest
index 91223e8..f9b6a54 100644
--- a/ges/scenarios/play_two_nested_back_to_back.validatetest
+++ b/ges/scenarios/play_two_nested_back_to_back.validatetest
@@ -6,7 +6,7 @@ meta,
needs_preroll=true,
ges-options= {
--track-types, video,
- --video-caps, "video/x-raw, format=(string)I420, width=(int)1080, height=(int)720, framerate=(fraction)1/1",
+ --video-caps, "video/x-raw, format=(string)I420, width=(int)1080, height=(int)720, framerate=(fraction)1/1, chroma-site=(string)jpeg, colorimetry=(string)bt601",
--videosink, "$(videosink) name=videosink",
},
configs = {
diff --git a/ges/scenarios/play_two_nested_back_to_back/flow-expectations/log-videosink-sink-expected b/ges/scenarios/play_two_nested_back_to_back/flow-expectations/log-videosink-sink-expected
index c73a26a..60a1194 100644
--- a/ges/scenarios/play_two_nested_back_to_back/flow-expectations/log-videosink-sink-expected
+++ b/ges/scenarios/play_two_nested_back_to_back/flow-expectations/log-videosink-sink-expected
@@ -1,5 +1,5 @@
event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, stream=(GstStream)"\(GstStream\)\ stream0";
-event caps: video/x-raw, format=(string)I420, width=(int)1080, height=(int)720, framerate=(fraction)1/1, chroma-site=(string)jpeg, colorimetry=(string)1:4:0:0;
+event caps: video/x-raw, format=(string)I420, width=(int)1080, height=(int)720, framerate=(fraction)1/1, chroma-site=(string)jpeg, colorimetry=(string)bt601;
event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:02.000000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000, position=none
buffer: checksum=68cc0c0b6d6863a135f40297a54aec9f1593f34c, pts=0:00:00.000000000, dur=0:00:01.000000000
buffer: checksum=9b42849e45e15981115cff9da00ecbf7afafd462, pts=0:00:01.000000000, dur=0:00:01.000000000
@@ -7,7 +7,6 @@ event segment: format=TIME, start=0:00:02.000000000, offset=0:00:00.000000000, s
buffer: checksum=13efd225948060c424b8cdb4c4d017dbea65f61f, pts=0:00:02.000000000, dur=0:00:01.000000000
buffer: checksum=919526ebc3b44b93c05806d4b6b19c82557ba2f7, pts=0:00:03.000000000, dur=0:00:01.000000000
buffer: checksum=6e031a9b81fb4de38bb58ab935d709661087caa4, pts=0:00:04.000000000, dur=0:00:01.000000000
-event caps: video/x-raw, format=(string)I420, width=(int)1080, height=(int)720, framerate=(fraction)1/1, chroma-site=(string)jpeg, colorimetry=(string)bt601;
event segment: format=TIME, start=0:00:05.000000000, offset=0:00:00.000000000, stop=0:00:05.000000001, flags=0x01, time=0:00:05.000000000, base=0:00:05.000000000, position=none
buffer: checksum=b13fcbc51ceae3d11232a95b192760d61baf4748, pts=0:00:05.000000000, dur=0:00:00.000000001
event eos: (no structure)
diff --git a/testsuites/validate/interlace/interlace_deinterlace.validatetest b/testsuites/validate/interlace/interlace_deinterlace.validatetest
index 0b479fb..94e907c 100644
--- a/testsuites/validate/interlace/interlace_deinterlace.validatetest
+++ b/testsuites/validate/interlace/interlace_deinterlace.validatetest
@@ -1,6 +1,6 @@
meta,
args = {
- "videotestsrc num-buffers=10 ! interlace ! video/x-raw,interlace-mode=mixed ! deinterlace ! video/x-raw,interlace-mode=progressive ! fakevideosink name=fakevideosink",
+ "videotestsrc num-buffers=10 ! interlace ! video/x-raw,format=I420,interlace-mode=mixed ! deinterlace ! video/x-raw,interlace-mode=progressive ! fakevideosink name=fakevideosink",
},
configs = {
"$(validateflow), pad=fakevideosink:sink, record-buffers=true, buffers-checksum=true",
diff --git a/testsuites/validate/interlace/interlace_deinterlace_alternate.validatetest b/testsuites/validate/interlace/interlace_deinterlace_alternate.validatetest
index ceb932f..a972455 100644
--- a/testsuites/validate/interlace/interlace_deinterlace_alternate.validatetest
+++ b/testsuites/validate/interlace/interlace_deinterlace_alternate.validatetest
@@ -1,6 +1,6 @@
meta,
args = {
- "videotestsrc num-buffers=10 ! interlace ! video/x-raw\(format:Interlaced\) ! deinterlace ! video/x-raw ! fakevideosink name=fakevideosink",
+ "videotestsrc num-buffers=10 ! interlace ! video/x-raw\(format:Interlaced\),format=I420 ! deinterlace ! video/x-raw ! fakevideosink name=fakevideosink",
},
configs = {
"$(validateflow), pad=fakevideosink:sink, record-buffers=true, buffers-checksum=true",