ges: Update expectations after moving videoconvert to after the mixer

See https://gitlab.freedesktop.org/gstreamer/gst-editing-services/-/merge_requests/204

7 files changed, 15 insertions, 13 deletions

diff --git a/ges/scenarios/check_edit_nested_timeline/flow-expectations/log-videosink-sink-expected b/ges/scenarios/check_edit_nested_timeline/flow-expectations/log-videosink-sink-expected
index ec33c64..87384aa 100644
--- a/ges/scenarios/check_edit_nested_timeline/flow-expectations/log-videosink-sink-expected
+++ b/ges/scenarios/check_edit_nested_timeline/flow-expectations/log-videosink-sink-expected
@@ -1,5 +1,5 @@
 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, width=(int)1080, height=(int)720, framerate=(fraction)1/1, format=(string)I420, chroma-site=(string)jpeg, colorimetry=(string)1:4:0:0;
 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
 
diff --git a/ges/scenarios/check_set_inpoint_on_nested_timeline/flow-expectations/log-videosink-sink-expected b/ges/scenarios/check_set_inpoint_on_nested_timeline/flow-expectations/log-videosink-sink-expected
index 4a281aa..e427244 100644
--- a/ges/scenarios/check_set_inpoint_on_nested_timeline/flow-expectations/log-videosink-sink-expected
+++ b/ges/scenarios/check_set_inpoint_on_nested_timeline/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, width=(int)1080, height=(int)720, framerate=(fraction)1/1, format=(string)I420, chroma-site=(string)jpeg, colorimetry=(string)1:4:0:0;
 event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:20.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
 event flush-start: (no structure)
diff --git a/ges/scenarios/edit_deeply_nested_timeline_too_short.validatetest b/ges/scenarios/edit_deeply_nested_timeline_too_short.validatetest
index c168e25..10ae847 100644
--- a/ges/scenarios/edit_deeply_nested_timeline_too_short.validatetest
+++ b/ges/scenarios/edit_deeply_nested_timeline_too_short.validatetest
@@ -10,7 +10,9 @@ meta,
         --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}\"",
+        "$(validateflow), pad=videosink:sink, record-buffers=true,
+            ignored-fields=\"stream-start={stream-id,group-id,stream}\",
+            caps-properties={height,width,framerate}",
     }
 
 set-vars,
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 a1cc60a..11a96ee 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
@@ -1,18 +1,18 @@
 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, width=(int)1080, height=(int)720, framerate=(fraction)1/1;
 event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:04.000000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000, position=none
-buffer: pts=0:00:00.000000000, dur=0:00:01.000000000
+buffer: pts=0:00:00.000000000, dur=0:00:01.000000000, meta=GstVideoMeta
 event flush-start: (no structure)
 event flush-stop: GstEventFlushStop, reset-time=(boolean)true;
 event segment: format=TIME, start=0:00:03.000000000, offset=0:00:00.000000000, stop=0:00:04.000000000, flags=0x01, time=0:00:03.000000000, base=0:00:00.000000000, position=none
-buffer: pts=0:00:03.000000000, dur=0:00:01.000000000
+buffer: pts=0:00:03.000000000, dur=0:00:01.000000000, meta=GstVideoMeta
 
 CHECKPOINT: Paused pipeline, now editing nested timeline and committing.
 
 event flush-start: (no structure)
 event flush-stop: GstEventFlushStop, reset-time=(boolean)true;
-event caps: video/x-raw, format=(string)I420, width=(int)1080, height=(int)720, framerate=(fraction)30/1, chroma-site=(string)mpeg2, colorimetry=(string)bt709;
 event segment: format=TIME, start=0:00:03.000000000, offset=0:00:00.000000000, stop=0:00:04.000000000, flags=0x01, time=0:00:03.000000000, base=0:00:00.000000000, position=none
+event caps: video/x-raw, width=(int)1080, height=(int)720, framerate=(fraction)30/1;
 buffer: pts=0:00:03.000000000, dur=0:00:00.033333333
 buffer: pts=0:00:03.033333333, dur=0:00:00.033333334
 buffer: pts=0:00:03.066666667, dur=0:00:00.033333333
@@ -43,6 +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, width=(int)320, height=(int)240, framerate=(fraction)30/1;
 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/flow-expectations/log-videosink-sink-expected b/ges/scenarios/play_deeply_nested_back_to_back/flow-expectations/log-videosink-sink-expected
index 5f0af92..ac43afa 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,5 +1,5 @@
 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)bt601;
+event caps: video/x-raw, width=(int)1080, height=(int)720, framerate=(fraction)1/1, format=(string)I420, 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,5 +7,5 @@ event segment: format=TIME, start=0:00:02.000000000, offset=0:00:00.000000000, s
 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 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
+buffer: checksum=b13fcbc51ceae3d11232a95b192760d61baf4748, pts=0:00:04.000000000, dur=0:00:00.000000001, meta=GstVideoMeta
 event eos: (no structure)
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 60a1194..e263328 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)bt601;
+event caps: video/x-raw, width=(int)1080, height=(int)720, framerate=(fraction)1/1, format=(string)I420, 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
@@ -8,5 +8,5 @@ buffer: checksum=13efd225948060c424b8cdb4c4d017dbea65f61f, pts=0:00:02.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 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
+buffer: checksum=b13fcbc51ceae3d11232a95b192760d61baf4748, pts=0:00:05.000000000, dur=0:00:00.000000001, meta=GstVideoMeta
 event eos: (no structure)
diff --git a/ges/scenarios/seek_on_stack_change_on_internal_subtimeline/flow-expectations/log-videosink-sink-expected b/ges/scenarios/seek_on_stack_change_on_internal_subtimeline/flow-expectations/log-videosink-sink-expected
index 8170276..a8fdb01 100644
--- a/ges/scenarios/seek_on_stack_change_on_internal_subtimeline/flow-expectations/log-videosink-sink-expected
+++ b/ges/scenarios/seek_on_stack_change_on_internal_subtimeline/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, width=(int)1080, height=(int)720, framerate=(fraction)1/1, format=(string)I420, chroma-site=(string)jpeg, colorimetry=(string)1:4:0:0;
 event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:04.000000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000, position=none
 buffer: checksum=9b42849e45e15981115cff9da00ecbf7afafd462, pts=0:00:00.000000000, dur=0:00:01.000000000
 event flush-start: (no structure)