Update expectation files with sorted structure fields

22 files changed, 32 insertions, 32 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 87384aa..c203ebc 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, width=(int)1080, height=(int)720, framerate=(fraction)1/1, format=(string)I420, chroma-site=(string)jpeg, colorimetry=(string)1:4:0:0;
+event caps: video/x-raw, chroma-site=(string)jpeg, colorimetry=(string)1:4:0:0, format=(string)I420, framerate=(fraction)1/1, height=(int)720, width=(int)1080;
 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 e427244..c14a855 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, width=(int)1080, height=(int)720, framerate=(fraction)1/1, format=(string)I420, chroma-site=(string)jpeg, colorimetry=(string)1:4:0:0;
+event caps: video/x-raw, chroma-site=(string)jpeg, colorimetry=(string)1:4:0:0, format=(string)I420, framerate=(fraction)1/1, height=(int)720, width=(int)1080;
 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/flow-expectations/log-videosink-sink-expected b/ges/scenarios/edit_deeply_nested_timeline_too_short/flow-expectations/log-videosink-sink-expected
index f106769..51909c9 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,5 +1,5 @@
 event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE;
-event caps: video/x-raw, width=(int)1080, height=(int)720, framerate=(fraction)1/1;
+event caps: video/x-raw, framerate=(fraction)1/1, height=(int)720, width=(int)1080;
 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
 buffer: pts=0:00:00.000000000, dur=0:00:01.000000000
 event flush-start: (no structure)
@@ -11,8 +11,8 @@ 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, framerate=(fraction)30/1, height=(int)720, width=(int)1080;
 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
-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,7 +43,7 @@ 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 caps: video/x-raw, framerate=(fraction)30/1, height=(int)720, width=(int)1080;
 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
 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 ac43afa..df24dfb 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, width=(int)1080, height=(int)720, framerate=(fraction)1/1, format=(string)I420, chroma-site=(string)jpeg, colorimetry=(string)bt601;
+event caps: video/x-raw, chroma-site=(string)jpeg, colorimetry=(string)bt601, format=(string)I420, framerate=(fraction)1/1, height=(int)720, width=(int)1080;
 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
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 e263328..da121ce 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, width=(int)1080, height=(int)720, framerate=(fraction)1/1, format=(string)I420, chroma-site=(string)jpeg, colorimetry=(string)bt601;
+event caps: video/x-raw, chroma-site=(string)jpeg, colorimetry=(string)bt601, format=(string)I420, framerate=(fraction)1/1, height=(int)720, width=(int)1080;
 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
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 a8fdb01..9e95bd6 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, width=(int)1080, height=(int)720, framerate=(fraction)1/1, format=(string)I420, chroma-site=(string)jpeg, colorimetry=(string)1:4:0:0;
+event caps: video/x-raw, chroma-site=(string)jpeg, colorimetry=(string)1:4:0:0, format=(string)I420, framerate=(fraction)1/1, height=(int)720, width=(int)1080;
 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)
diff --git a/testsuites/validate/appsrc/single_push/flow-expectations/log-fakesink0-sink-expected b/testsuites/validate/appsrc/single_push/flow-expectations/log-fakesink0-sink-expected
index 6344686..363ac6a 100644
--- a/testsuites/validate/appsrc/single_push/flow-expectations/log-fakesink0-sink-expected
+++ b/testsuites/validate/appsrc/single_push/flow-expectations/log-fakesink0-sink-expected
@@ -1,5 +1,5 @@
 event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, group-id=(uint)1;
-event caps: video/x-h264, stream-format=(string)avc, alignment=(string)au, level=(string)2, profile=(string)high, codec_data=(buffer)01640014ffe1001867640014acd94141fb0110000003001773594000f142996001000568ebecb22c, width=(int)320, height=(int)240, framerate=(fraction)30/1, pixel-aspect-ratio=(fraction)1/1;
+event caps: video/x-h264, alignment=(string)au, codec_data=(buffer)01640014ffe1001867640014acd94141fb0110000003001773594000f142996001000568ebecb22c, framerate=(fraction)30/1, height=(int)240, level=(string)2, pixel-aspect-ratio=(fraction)1/1, profile=(string)high, stream-format=(string)avc, width=(int)320;
 event segment: format=TIME, start=0:00:00.066666666, offset=0:00:00.000000000, stop=0:00:10.066666666, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.066666666
 event tag: GstTagList-stream, taglist=(taglist)"taglist\,\ video-codec\=\(string\)\"H.264\\\ /\\\ AVC\"\,\ bitrate\=\(uint\)99582\,\ language-code\=\(string\)en\;";
 event tag: GstTagList-global, taglist=(taglist)"taglist\,\ datetime\=\(datetime\)2013-09-03T16:21:35Z\,\ description\=\(string\)\"audiotest\\\ wave\"\,\ encoder\=\(string\)x264\,\ container-format\=\(string\)Quicktime\;";
diff --git a/testsuites/validate/clock_sync/video_1fps/flow-expectations/log-videosink-sink-expected b/testsuites/validate/clock_sync/video_1fps/flow-expectations/log-videosink-sink-expected
index 36d2135..2d35258 100644
--- a/testsuites/validate/clock_sync/video_1fps/flow-expectations/log-videosink-sink-expected
+++ b/testsuites/validate/clock_sync/video_1fps/flow-expectations/log-videosink-sink-expected
@@ -1,6 +1,6 @@
 event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, group-id=(uint)1;
-event caps: video/x-raw, format=(string)I420, width=(int)320, height=(int)240, framerate=(fraction)1/1, multiview-mode=(string)mono, pixel-aspect-ratio=(fraction)1/1, interlace-mode=(string)progressive;
-event caps: video/x-raw, format=(string)I420, width=(int)320, height=(int)240, framerate=(fraction)1/1, multiview-mode=(string)mono, pixel-aspect-ratio=(fraction)1/1, interlace-mode=(string)progressive;
+event caps: video/x-raw, format=(string)I420, framerate=(fraction)1/1, height=(int)240, interlace-mode=(string)progressive, multiview-mode=(string)mono, pixel-aspect-ratio=(fraction)1/1, width=(int)320;
+event caps: video/x-raw, format=(string)I420, framerate=(fraction)1/1, height=(int)240, interlace-mode=(string)progressive, multiview-mode=(string)mono, pixel-aspect-ratio=(fraction)1/1, width=(int)320;
 event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=none, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.000000000
 buffer: pts=0:00:00.000000000, dur=0:00:01.000000000, flags=discont, meta=GstVideoMeta
 event flush-start: (no structure)
diff --git a/testsuites/validate/clock_sync/video_30fps/flow-expectations/log-videosink-sink-expected b/testsuites/validate/clock_sync/video_30fps/flow-expectations/log-videosink-sink-expected
index 491384f..27d35b2 100644
--- a/testsuites/validate/clock_sync/video_30fps/flow-expectations/log-videosink-sink-expected
+++ b/testsuites/validate/clock_sync/video_30fps/flow-expectations/log-videosink-sink-expected
@@ -1,6 +1,6 @@
 event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, group-id=(uint)1;
-event caps: video/x-raw, format=(string)I420, width=(int)320, height=(int)240, framerate=(fraction)30/1, multiview-mode=(string)mono, pixel-aspect-ratio=(fraction)1/1, interlace-mode=(string)progressive;
-event caps: video/x-raw, format=(string)I420, width=(int)320, height=(int)240, framerate=(fraction)30/1, multiview-mode=(string)mono, pixel-aspect-ratio=(fraction)1/1, interlace-mode=(string)progressive;
+event caps: video/x-raw, format=(string)I420, framerate=(fraction)30/1, height=(int)240, interlace-mode=(string)progressive, multiview-mode=(string)mono, pixel-aspect-ratio=(fraction)1/1, width=(int)320;
+event caps: video/x-raw, format=(string)I420, framerate=(fraction)30/1, height=(int)240, interlace-mode=(string)progressive, multiview-mode=(string)mono, pixel-aspect-ratio=(fraction)1/1, width=(int)320;
 event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=none, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.000000000
 buffer: pts=0:00:00.000000000, dur=0:00:00.033333333, flags=discont, meta=GstVideoMeta
 event flush-start: (no structure)
diff --git a/testsuites/validate/decryptor/cenc_audio_esds_property_overrides/flow-expectations/log-fakesink0-sink-expected b/testsuites/validate/decryptor/cenc_audio_esds_property_overrides/flow-expectations/log-fakesink0-sink-expected
index 54d380b..72c54d9 100644
--- a/testsuites/validate/decryptor/cenc_audio_esds_property_overrides/flow-expectations/log-fakesink0-sink-expected
+++ b/testsuites/validate/decryptor/cenc_audio_esds_property_overrides/flow-expectations/log-fakesink0-sink-expected
@@ -1,11 +1,11 @@
 event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, group-id=(uint)1;
-event caps: audio/mpeg, mpegversion=(int)4, framed=(boolean)true, stream-format=(string)raw, level=(string)1, base-profile=(string)lc, profile=(string)lc, codec_data=(buffer)1388, rate=(int)22050, channels=(int)1;
+event caps: audio/mpeg, base-profile=(string)lc, channels=(int)1, codec_data=(buffer)1388, framed=(boolean)true, level=(string)1, mpegversion=(int)4, profile=(string)lc, rate=(int)22050, stream-format=(string)raw;
 event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=none, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.000000000
 event tag: GstTagList-stream, taglist=(taglist)"taglist\,\ audio-codec\=\(string\)\"MPEG-4\\\ AAC\\\ audio\"\;";
 event tag: GstTagList-global, taglist=(taglist)"taglist\,\ datetime\=\(datetime\)2012-11-14T07:38:32Z\,\ container-format\=\(string\)\"ISO\\\ fMP4\"\;";
-event protection: GstProtectionEvent-isobmff/moov-edef8ba9-79d6-4ace-a3c8-27dcd51d21ed, data=(buffer)000000347073736800000000edef8ba979d64acea3c827dcd51d21ed00000014080112107b1328eb61b554e293f75b1e3e94cc3b, system_id=(string)edef8ba9-79d6-4ace-a3c8-27dcd51d21ed, origin=(string)isobmff/moov;
-event protection: GstProtectionEvent-isobmff/moov-9a04f079-9840-4286-ab92-e65be0885f95, data=(buffer)000002f470737368000000009a04f07998404286ab92e65be0885f95000002d4d402000001000100ca023c00570052004d00480045004100440045005200200078006d006c006e0073003d00220068007400740070003a002f002f0073006300680065006d00610073002e006d006900630072006f0073006f00660074002e0063006f006d002f00440052004d002f0032003000300037002f00300033002f0050006c00610079005200650061006400790048006500610064006500720022002000760065007200730069006f006e003d00220034002e0030002e0030002e00300022003e003c0044004100540041003e003c00500052004f00540045004300540049004e0046004f003e003c004b00450059004c0045004e003e00310036003c002f004b00450059004c0045004e003e003c0041004c004700490044003e004100450053004300540052003c002f0041004c004700490044003e003c002f00500052004f00540045004300540049004e0046004f003e003c004b00490044003e003600790067005400650037005600680034006c005300540039003100730065005000700054004d004f0077003d003d003c002f004b00490044003e003c0043004800450043004b00530055004d003e0070006d002b0053003000490047006e006f00300073003d003c002f0043004800450043004b00530055004d003e003c004c0041005f00550052004c003e00680074007400700073003a002f002f007700770077002e0079006f00750074007500620065002e0063006f006d002f006100700069002f00640072006d002f0070006c0061007900720065006100640079003f0073006f0075007200630065003d0059004f0055005400550042004500260061006d0070003b0076006900640065006f005f00690064003d0030003300360038003100320036003200640063003400310032006300300036003c002f004c0041005f00550052004c003e003c002f0044004100540041003e003c002f00570052004d004800450041004400450052003e00, system_id=(string)9a04f079-9840-4286-ab92-e65be0885f95, origin=(string)isobmff/moov;
-event protection: GstProtectionEvent-isobmff/moov-58147ec8-0423-4659-92e6-f52c5ce8c3cc, data=(buffer)00000030707373680000000058147ec80423465992e6f52c5ce8c3cc000000107b1328eb61b554e293f75b1e3e94cc3b, system_id=(string)58147ec8-0423-4659-92e6-f52c5ce8c3cc, origin=(string)isobmff/moov;
+event protection: GstProtectionEvent-isobmff/moov-edef8ba9-79d6-4ace-a3c8-27dcd51d21ed, data=(buffer)000000347073736800000000edef8ba979d64acea3c827dcd51d21ed00000014080112107b1328eb61b554e293f75b1e3e94cc3b, origin=(string)isobmff/moov, system_id=(string)edef8ba9-79d6-4ace-a3c8-27dcd51d21ed;
+event protection: GstProtectionEvent-isobmff/moov-9a04f079-9840-4286-ab92-e65be0885f95, data=(buffer)000002f470737368000000009a04f07998404286ab92e65be0885f95000002d4d402000001000100ca023c00570052004d00480045004100440045005200200078006d006c006e0073003d00220068007400740070003a002f002f0073006300680065006d00610073002e006d006900630072006f0073006f00660074002e0063006f006d002f00440052004d002f0032003000300037002f00300033002f0050006c00610079005200650061006400790048006500610064006500720022002000760065007200730069006f006e003d00220034002e0030002e0030002e00300022003e003c0044004100540041003e003c00500052004f00540045004300540049004e0046004f003e003c004b00450059004c0045004e003e00310036003c002f004b00450059004c0045004e003e003c0041004c004700490044003e004100450053004300540052003c002f0041004c004700490044003e003c002f00500052004f00540045004300540049004e0046004f003e003c004b00490044003e003600790067005400650037005600680034006c005300540039003100730065005000700054004d004f0077003d003d003c002f004b00490044003e003c0043004800450043004b00530055004d003e0070006d002b0053003000490047006e006f00300073003d003c002f0043004800450043004b00530055004d003e003c004c0041005f00550052004c003e00680074007400700073003a002f002f007700770077002e0079006f00750074007500620065002e0063006f006d002f006100700069002f00640072006d002f0070006c0061007900720065006100640079003f0073006f0075007200630065003d0059004f0055005400550042004500260061006d0070003b0076006900640065006f005f00690064003d0030003300360038003100320036003200640063003400310032006300300036003c002f004c0041005f00550052004c003e003c002f0044004100540041003e003c002f00570052004d004800450041004400450052003e00, origin=(string)isobmff/moov, system_id=(string)9a04f079-9840-4286-ab92-e65be0885f95;
+event protection: GstProtectionEvent-isobmff/moov-58147ec8-0423-4659-92e6-f52c5ce8c3cc, data=(buffer)00000030707373680000000058147ec80423465992e6f52c5ce8c3cc000000107b1328eb61b554e293f75b1e3e94cc3b, origin=(string)isobmff/moov, system_id=(string)58147ec8-0423-4659-92e6-f52c5ce8c3cc;
 buffer: dts=0:00:00.000000000, pts=0:00:00.000000000, dur=0:00:00.046439909, flags=discont
 buffer: dts=0:00:00.046439909, pts=0:00:00.046439909, dur=0:00:00.046439909
 buffer: dts=0:00:00.092879818, pts=0:00:00.092879818, dur=0:00:00.046439909
diff --git a/testsuites/validate/flow/simple_test/flow-expectations/log-fakesink0-sink-expected b/testsuites/validate/flow/simple_test/flow-expectations/log-fakesink0-sink-expected
index 0f23177..0f951af 100644
--- a/testsuites/validate/flow/simple_test/flow-expectations/log-fakesink0-sink-expected
+++ b/testsuites/validate/flow/simple_test/flow-expectations/log-fakesink0-sink-expected
@@ -1,5 +1,5 @@
 event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, group-id=(uint)1;
-event caps: video/x-raw, width=(int)320, height=(int)240;
+event caps: video/x-raw, height=(int)240, width=(int)320;
 event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=none, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.000000000
 buffer: pts=0:00:00.000000000, dur=0:00:00.033333333, flags=discont
 buffer: pts=0:00:00.033333333, dur=0:00:00.033333333
diff --git a/testsuites/validate/h264/parse.trickmode_predicted.seek_trickmode_predicted/flow-expectations/log-parse-src-expected b/testsuites/validate/h264/parse.trickmode_predicted.seek_trickmode_predicted/flow-expectations/log-parse-src-expected
index 95129b8..02e4541 100644
--- a/testsuites/validate/h264/parse.trickmode_predicted.seek_trickmode_predicted/flow-expectations/log-parse-src-expected
+++ b/testsuites/validate/h264/parse.trickmode_predicted.seek_trickmode_predicted/flow-expectations/log-parse-src-expected
@@ -1,5 +1,5 @@
 event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, group-id=(uint)1;
-event caps: video/x-h264, stream-format=(string)avc, alignment=(string)au, level=(string)2, profile=(string)high, codec_data=(buffer)01640014ffe1001867640014acd94141fb0110000003001773594000f142996001000568ebecb22c, width=(int)320, height=(int)240, framerate=(fraction)30/1, pixel-aspect-ratio=(fraction)1/1, chroma-format=(string)4:2:0, bit-depth-luma=(uint)8, bit-depth-chroma=(uint)8, parsed=(boolean)true;
+event caps: video/x-h264, alignment=(string)au, bit-depth-chroma=(uint)8, bit-depth-luma=(uint)8, chroma-format=(string)4:2:0, codec_data=(buffer)01640014ffe1001867640014acd94141fb0110000003001773594000f142996001000568ebecb22c, framerate=(fraction)30/1, height=(int)240, level=(string)2, parsed=(boolean)true, pixel-aspect-ratio=(fraction)1/1, profile=(string)high, stream-format=(string)avc, width=(int)320;
 event segment: format=TIME, start=0:00:00.066666666, offset=0:00:00.000000000, stop=0:00:10.066666666, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.066666666
 event tag: GstTagList-stream, taglist=(taglist)"taglist\,\ video-codec\=\(string\)\"H.264\\\ /\\\ AVC\"\,\ bitrate\=\(uint\)99582\,\ language-code\=\(string\)en\;";
 event tag: GstTagList-global, taglist=(taglist)"taglist\,\ datetime\=\(datetime\)2013-09-03T16:21:39Z\,\ description\=\(string\)\"audiotest\\\ wave\"\,\ encoder\=\(string\)x264\,\ container-format\=\(string\)Quicktime\;";
diff --git a/testsuites/validate/h265parse/alternate/flow-expectations/log-fakesink-sink-expected b/testsuites/validate/h265parse/alternate/flow-expectations/log-fakesink-sink-expected
index c4abbad..0419ad2 100644
--- a/testsuites/validate/h265parse/alternate/flow-expectations/log-fakesink-sink-expected
+++ b/testsuites/validate/h265parse/alternate/flow-expectations/log-fakesink-sink-expected
@@ -1,5 +1,5 @@
 event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, group-id=(uint)1;
-event caps: video/x-h265, width=(int)300, height=(int)200, framerate=(fraction)75/1, chroma-format=(string)4:2:0, bit-depth-luma=(uint)8, bit-depth-chroma=(uint)8, colorimetry=(string)2:0:0:1, parsed=(boolean)true, stream-format=(string)hvc1, alignment=(string)au, profile=(string)main, tier=(string)main, level=(string)2, codec_data=(buffer)0101400000004000000000003cf000fcfdf8f800000f03200001001840010c01ffff01400000030040000003000003003c250240210001003642010101400000030040000003000003003ca009881a7779e96e44a1735010202ed00000030010000004b51affde103e805df7c2010422000100074401c07181cdb2;
+event caps: video/x-h265, alignment=(string)au, bit-depth-chroma=(uint)8, bit-depth-luma=(uint)8, chroma-format=(string)4:2:0, codec_data=(buffer)0101400000004000000000003cf000fcfdf8f800000f03200001001840010c01ffff01400000030040000003000003003c250240210001003642010101400000030040000003000003003ca009881a7779e96e44a1735010202ed00000030010000004b51affde103e805df7c2010422000100074401c07181cdb2, colorimetry=(string)2:0:0:1, framerate=(fraction)75/1, height=(int)200, level=(string)2, parsed=(boolean)true, profile=(string)main, stream-format=(string)hvc1, tier=(string)main, width=(int)300;
 event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=none, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.000000000
 event tag: GstTagList-stream, taglist=(taglist)"taglist\,\ video-codec\=\(string\)\"H.265\\\ \\\(Main\\\ Profile\\\)\"\;";
 buffer: dts=0:00:00.000000000, dur=0:00:00.006666666, flags=discont marker header last
diff --git a/testsuites/validate/h265parse/trickmode_predicted.seek_trickmode_predicted/flow-expectations/log-parse-src-expected b/testsuites/validate/h265parse/trickmode_predicted.seek_trickmode_predicted/flow-expectations/log-parse-src-expected
index a868845..dd270b9 100644
--- a/testsuites/validate/h265parse/trickmode_predicted.seek_trickmode_predicted/flow-expectations/log-parse-src-expected
+++ b/testsuites/validate/h265parse/trickmode_predicted.seek_trickmode_predicted/flow-expectations/log-parse-src-expected
@@ -1,5 +1,5 @@
 event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, group-id=(uint)1;
-event caps: video/x-h265, stream-format=(string)hvc1, alignment=(string)au, level=(string)2.1, tier=(string)main, profile=(string)main-10, codec_data=(buffer)0102200000009000000000003ff000fcfdfafa00000f03200001001840010c01ffff02200000030090000003000003003f959009210001002e42010102200000030090000003000003003fa00a080f136595924932bffc0004000404000003000400000300782022000100074401c172b46240, width=(int)320, height=(int)240, framerate=(fraction)30/1, pixel-aspect-ratio=(fraction)1/1, colorimetry=(string)2:4:5:4, chroma-format=(string)4:2:0, bit-depth-luma=(uint)10, bit-depth-chroma=(uint)10, parsed=(boolean)true;
+event caps: video/x-h265, alignment=(string)au, bit-depth-chroma=(uint)10, bit-depth-luma=(uint)10, chroma-format=(string)4:2:0, codec_data=(buffer)0102200000009000000000003ff000fcfdfafa00000f03200001001840010c01ffff02200000030090000003000003003f959009210001002e42010102200000030090000003000003003fa00a080f136595924932bffc0004000404000003000400000300782022000100074401c172b46240, colorimetry=(string)2:4:5:4, framerate=(fraction)30/1, height=(int)240, level=(string)2.1, parsed=(boolean)true, pixel-aspect-ratio=(fraction)1/1, profile=(string)main-10, stream-format=(string)hvc1, tier=(string)main, width=(int)320;
 event segment: format=TIME, start=0:00:00.066666666, offset=0:00:00.000000000, stop=0:00:10.066666666, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.066666666
 event tag: GstTagList-stream, taglist=(taglist)"taglist\,\ video-codec\=\(string\)\"H.265\\\ /\\\ HEVC\"\,\ encoder\=\(string\)x265\,\ bitrate\=\(uint\)1547698\;";
 event tag: GstTagList-global, taglist=(taglist)"taglist\,\ datetime\=\(datetime\)2019-07-15T17:28:39Z\,\ container-format\=\(string\)\"ISO\\\ MP4/M4A\"\;";
diff --git a/testsuites/validate/interlace/interlace_deinterlace/flow-expectations/log-fakevideosink-sink-expected b/testsuites/validate/interlace/interlace_deinterlace/flow-expectations/log-fakevideosink-sink-expected
index 14da745..0d02cf7 100644
--- a/testsuites/validate/interlace/interlace_deinterlace/flow-expectations/log-fakevideosink-sink-expected
+++ b/testsuites/validate/interlace/interlace_deinterlace/flow-expectations/log-fakevideosink-sink-expected
@@ -1,5 +1,5 @@
 event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, group-id=(uint)1;
-event caps: video/x-raw, format=(string)I420, width=(int)320, height=(int)240, multiview-mode=(string)mono, interlace-mode=(string)progressive, pixel-aspect-ratio=(fraction)1/1, framerate=(fraction)75/1;
+event caps: video/x-raw, format=(string)I420, framerate=(fraction)75/1, height=(int)240, interlace-mode=(string)progressive, multiview-mode=(string)mono, pixel-aspect-ratio=(fraction)1/1, width=(int)320;
 event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=none, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.000000000
 buffer: checksum=96f54b85d2ba09c1f8d6863771304c191d8a0e83, dts=0:00:00.000000000, pts=0:00:00.000000000, dur=0:00:00.026666666, flags=discont
 buffer: checksum=06ea7c0dce328162fbd15515cd40f6ab9b2fedad, dts=0:00:00.026666666, pts=0:00:00.026666666, dur=0:00:00.026666666
diff --git a/testsuites/validate/interlace/interlace_deinterlace_alternate/flow-expectations/log-fakevideosink-sink-expected b/testsuites/validate/interlace/interlace_deinterlace_alternate/flow-expectations/log-fakevideosink-sink-expected
index bfbec4a..671159f 100644
--- a/testsuites/validate/interlace/interlace_deinterlace_alternate/flow-expectations/log-fakevideosink-sink-expected
+++ b/testsuites/validate/interlace/interlace_deinterlace_alternate/flow-expectations/log-fakevideosink-sink-expected
@@ -1,5 +1,5 @@
 event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, group-id=(uint)1;
-event caps: video/x-raw, format=(string)I420, width=(int)320, height=(int)240, multiview-mode=(string)mono, interlace-mode=(string)progressive, pixel-aspect-ratio=(fraction)1/1, framerate=(fraction)75/1, field-order=(string)bottom-field-first;
+event caps: video/x-raw, field-order=(string)bottom-field-first, format=(string)I420, framerate=(fraction)75/1, height=(int)240, interlace-mode=(string)progressive, multiview-mode=(string)mono, pixel-aspect-ratio=(fraction)1/1, width=(int)320;
 event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=none, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.000000000
 buffer: checksum=bf6625bbbe79889dff9c9b243d706889179e315e, pts=0:00:00.000000000, dur=0:00:00.013333333, flags=discont, meta=GstVideoMeta
 buffer: checksum=e2741266db11fcea33ce8308c228e786a707503a, pts=0:00:00.013333333, dur=0:00:00.013333333, meta=GstVideoMeta
diff --git a/testsuites/validate/matroska/demux_flush_within_cluster.default/flow-expectations/log-fakesink0-sink-expected b/testsuites/validate/matroska/demux_flush_within_cluster.default/flow-expectations/log-fakesink0-sink-expected
index 48df17f..9a4b892 100644
--- a/testsuites/validate/matroska/demux_flush_within_cluster.default/flow-expectations/log-fakesink0-sink-expected
+++ b/testsuites/validate/matroska/demux_flush_within_cluster.default/flow-expectations/log-fakesink0-sink-expected
@@ -1,5 +1,5 @@
 event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_SELECT, group-id=(uint)1;
-event caps: video/x-vp9, width=(int)426, height=(int)240, framerate=(fraction)0/1;
+event caps: video/x-vp9, framerate=(fraction)0/1, height=(int)240, width=(int)426;
 event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=none, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.000000000, duration=0:02:15.469000000
 event tag: GstTagList-global, taglist=(taglist)"taglist\,\ container-format\=\(string\)Matroska\;";
 event tag: GstTagList-stream, taglist=(taglist)"taglist\,\ video-codec\=\(string\)\"On2\\\ VP9\"\;";
diff --git a/testsuites/validate/mp4/qtdemux_change_edit_list.default/flow-expectations/log-fakesink0-sink-expected b/testsuites/validate/mp4/qtdemux_change_edit_list.default/flow-expectations/log-fakesink0-sink-expected
index a82806f..4bc204b 100644
--- a/testsuites/validate/mp4/qtdemux_change_edit_list.default/flow-expectations/log-fakesink0-sink-expected
+++ b/testsuites/validate/mp4/qtdemux_change_edit_list.default/flow-expectations/log-fakesink0-sink-expected
@@ -1,15 +1,15 @@
 event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, group-id=(uint)1;
-event caps: video/x-h264, stream-format=(string)avc, alignment=(string)au, level=(string)2.1, profile=(string)main, codec_data=(buffer)014d4015ffe10016674d4015d901b1fe4e1000003e90000bb800f162e48001000468eb8f20, width=(int)426, height=(int)240, pixel-aspect-ratio=(fraction)1/1;
+event caps: video/x-h264, alignment=(string)au, codec_data=(buffer)014d4015ffe10016674d4015d901b1fe4e1000003e90000bb800f162e48001000468eb8f20, height=(int)240, level=(string)2.1, pixel-aspect-ratio=(fraction)1/1, profile=(string)main, stream-format=(string)avc, width=(int)426;
 event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=none, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.000000000
 event tag: GstTagList-stream, taglist=(taglist)"taglist\,\ video-codec\=\(string\)\"H.264\\\ /\\\ AVC\"\;";
 event tag: GstTagList-global, taglist=(taglist)"taglist\,\ datetime\=\(datetime\)2012-08-27T01:00:50Z\,\ container-format\=\(string\)\"ISO\\\ fMP4\"\;";
 event tag: GstTagList-stream, taglist=(taglist)"taglist\,\ video-codec\=\(string\)\"H.264\\\ /\\\ AVC\"\;";
-event caps: video/x-h264, stream-format=(string)avc, alignment=(string)au, level=(string)2.1, profile=(string)main, codec_data=(buffer)014d4015ffe10016674d4015d901b1fe4e1000003e90000bb800f162e48001000468eb8f20, width=(int)426, height=(int)240, pixel-aspect-ratio=(fraction)1/1, framerate=(fraction)24000/1001;
+event caps: video/x-h264, alignment=(string)au, codec_data=(buffer)014d4015ffe10016674d4015d901b1fe4e1000003e90000bb800f162e48001000468eb8f20, framerate=(fraction)24000/1001, height=(int)240, level=(string)2.1, pixel-aspect-ratio=(fraction)1/1, profile=(string)main, stream-format=(string)avc, width=(int)426;
 
 CHECKPOINT: A moov with a different edit list is now pushed
 
-event caps: video/x-h264, stream-format=(string)avc, alignment=(string)au, level=(string)3, profile=(string)main, codec_data=(buffer)014d401effe10016674d401ee8805017fcb0800001f480005dc0078b168901000468ebaf20, width=(int)640, height=(int)360, pixel-aspect-ratio=(fraction)1/1;
+event caps: video/x-h264, alignment=(string)au, codec_data=(buffer)014d401effe10016674d401ee8805017fcb0800001f480005dc0078b168901000468ebaf20, height=(int)360, level=(string)3, pixel-aspect-ratio=(fraction)1/1, profile=(string)main, stream-format=(string)avc, width=(int)640;
 event segment: format=TIME, start=0:00:00.041711111, offset=0:00:00.000000000, stop=none, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.041711111
 event tag: GstTagList-stream, taglist=(taglist)"taglist\,\ video-codec\=\(string\)\"H.264\\\ /\\\ AVC\"\;";
 event tag: GstTagList-stream, taglist=(taglist)"taglist\,\ video-codec\=\(string\)\"H.264\\\ /\\\ AVC\"\;";
-event caps: video/x-h264, stream-format=(string)avc, alignment=(string)au, level=(string)3, profile=(string)main, codec_data=(buffer)014d401effe10016674d401ee8805017fcb0800001f480005dc0078b168901000468ebaf20, width=(int)640, height=(int)360, pixel-aspect-ratio=(fraction)1/1, framerate=(fraction)24000/1001;
+event caps: video/x-h264, alignment=(string)au, codec_data=(buffer)014d401effe10016674d401ee8805017fcb0800001f480005dc0078b168901000468ebaf20, framerate=(fraction)24000/1001, height=(int)360, level=(string)3, pixel-aspect-ratio=(fraction)1/1, profile=(string)main, stream-format=(string)avc, width=(int)640;
diff --git a/testsuites/validate/mp4/qtdemux_reverse_playback_full_gop.reverse_playback_full_gop/flow-expectations/log-parse-src-expected b/testsuites/validate/mp4/qtdemux_reverse_playback_full_gop.reverse_playback_full_gop/flow-expectations/log-parse-src-expected
index 133e2c0..a8269fe 100644
--- a/testsuites/validate/mp4/qtdemux_reverse_playback_full_gop.reverse_playback_full_gop/flow-expectations/log-parse-src-expected
+++ b/testsuites/validate/mp4/qtdemux_reverse_playback_full_gop.reverse_playback_full_gop/flow-expectations/log-parse-src-expected
@@ -1,5 +1,5 @@
 event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, group-id=(uint)1;
-event caps: video/x-h264, stream-format=(string)avc, alignment=(string)au, level=(string)2, profile=(string)high, codec_data=(buffer)01640014ffe1001867640014acd94141fb0110000003001773594000f142996001000568ebecb22c, width=(int)320, height=(int)240, framerate=(fraction)30/1, pixel-aspect-ratio=(fraction)1/1, chroma-format=(string)4:2:0, bit-depth-luma=(uint)8, bit-depth-chroma=(uint)8, parsed=(boolean)true;
+event caps: video/x-h264, alignment=(string)au, bit-depth-chroma=(uint)8, bit-depth-luma=(uint)8, chroma-format=(string)4:2:0, codec_data=(buffer)01640014ffe1001867640014acd94141fb0110000003001773594000f142996001000568ebecb22c, framerate=(fraction)30/1, height=(int)240, level=(string)2, parsed=(boolean)true, pixel-aspect-ratio=(fraction)1/1, profile=(string)high, stream-format=(string)avc, width=(int)320;
 event segment: format=TIME, start=0:00:00.066666666, offset=0:00:00.000000000, stop=0:00:10.066666666, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.066666666
 event tag: GstTagList-stream, taglist=(taglist)"taglist\,\ video-codec\=\(string\)\"H.264\\\ /\\\ AVC\"\,\ bitrate\=\(uint\)99582\,\ language-code\=\(string\)en\;";
 event tag: GstTagList-global, taglist=(taglist)"taglist\,\ datetime\=\(datetime\)2013-09-03T16:21:39Z\,\ description\=\(string\)\"audiotest\\\ wave\"\,\ encoder\=\(string\)x264\,\ container-format\=\(string\)Quicktime\;";
diff --git a/testsuites/validate/nle/urisource.play/flow-expectations/log-videoconvert-sink-expected b/testsuites/validate/nle/urisource.play/flow-expectations/log-videoconvert-sink-expected
index afe5738..7ef8071 100644
--- a/testsuites/validate/nle/urisource.play/flow-expectations/log-videoconvert-sink-expected
+++ b/testsuites/validate/nle/urisource.play/flow-expectations/log-videoconvert-sink-expected
@@ -1,7 +1,7 @@
 event flush-start: (no structure)
 event flush-stop: GstEventFlushStop, reset-time=(boolean)true;
 event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_SELECT, group-id=(uint)2;
-event caps: video/x-raw, format=(string)I420, width=(int)320, height=(int)240, interlace-mode=(string)progressive, pixel-aspect-ratio=(fraction)1/1, chroma-site=(string)mpeg2, framerate=(fraction)30/1;
+event caps: video/x-raw, chroma-site=(string)mpeg2, format=(string)I420, framerate=(fraction)30/1, height=(int)240, interlace-mode=(string)progressive, pixel-aspect-ratio=(fraction)1/1, width=(int)320;
 event segment: format=TIME, start=0:00:01.066000000, offset=0:00:00.000000000, stop=0:00:02.066000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.066000000, duration=0:00:02.500000000
 buffer: checksum=e50f6b4b8f6177668e437d9fb2957c43b1a5ca9e, pts=0:00:01.066000000, dur=0:00:00.000333333, flags=discont
 buffer: checksum=95c19a3dcb13126747d8147c1cc8b7678666798c, pts=0:00:01.066000000, dur=0:00:00.033333333
diff --git a/testsuites/validate/rtp/rtpsession_recv_simple/flow-expectations/log-fakesink0-sink-expected b/testsuites/validate/rtp/rtpsession_recv_simple/flow-expectations/log-fakesink0-sink-expected
index 833bd1a..5984c2c 100644
--- a/testsuites/validate/rtp/rtpsession_recv_simple/flow-expectations/log-fakesink0-sink-expected
+++ b/testsuites/validate/rtp/rtpsession_recv_simple/flow-expectations/log-fakesink0-sink-expected
@@ -1,5 +1,5 @@
 event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, group-id=(uint)1;
-event caps: video/x-raw, width=(int)320, height=(int)240, colorimetry=(string)sRGB;
+event caps: video/x-raw, colorimetry=(string)sRGB, height=(int)240, width=(int)320;
 event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=none, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.000000000
 buffer: pts=0:00:00.000000000, flags=discont
 buffer: pts=0:00:00.033333333
diff --git a/testsuites/validate/rtp/rtpsession_send_simple/flow-expectations/log-fakesink0-sink-expected b/testsuites/validate/rtp/rtpsession_send_simple/flow-expectations/log-fakesink0-sink-expected
index 833bd1a..5984c2c 100644
--- a/testsuites/validate/rtp/rtpsession_send_simple/flow-expectations/log-fakesink0-sink-expected
+++ b/testsuites/validate/rtp/rtpsession_send_simple/flow-expectations/log-fakesink0-sink-expected
@@ -1,5 +1,5 @@
 event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, group-id=(uint)1;
-event caps: video/x-raw, width=(int)320, height=(int)240, colorimetry=(string)sRGB;
+event caps: video/x-raw, colorimetry=(string)sRGB, height=(int)240, width=(int)320;
 event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=none, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.000000000
 buffer: pts=0:00:00.000000000, flags=discont
 buffer: pts=0:00:00.033333333