diff --git a/tests/validate/audiotestsrc/reverse/flow-expectations/log-asink-sink-expected b/tests/validate/audiotestsrc/reverse/flow-expectations/log-asink-sink-expected
index 5f0ca2ac0a..45f4f6b237 100644
--- a/tests/validate/audiotestsrc/reverse/flow-expectations/log-asink-sink-expected
+++ b/tests/validate/audiotestsrc/reverse/flow-expectations/log-asink-sink-expected
@@ -1,5 +1,5 @@
 event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE, group-id=(uint)1;
-event caps: audio/x-raw, format=(string)S16LE, layout=(string)interleaved, rate=(int)44100, channels=(int)1;
+event caps: audio/x-raw, channels=(int)1, format=(string)S16LE, layout=(string)interleaved, rate=(int)44100;
 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\,\ description\=\(string\)\"audiotest\\\ wave\"\;";
 buffer: pts=0:00:00.000000000, dur=0:00:00.023219954, flags=discont
diff --git a/tests/validate/videorate/10_to_1fps/flow-expectations/log-videorate-sink-expected b/tests/validate/videorate/10_to_1fps/flow-expectations/log-videorate-sink-expected
index fda778a9c6..b7a170f83b 100644
--- a/tests/validate/videorate/10_to_1fps/flow-expectations/log-videorate-sink-expected
+++ b/tests/validate/videorate/10_to_1fps/flow-expectations/log-videorate-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, framerate=(fraction)10/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)10/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=5074004a070c85d97cc9f58fab273813c95b748c, pts=0:00:00.000000000, dur=0:00:00.100000000, flags=discont
 buffer: checksum=d13b763048b4e8a132923ccec0cb0989a33ef44b, pts=0:00:00.100000000, dur=0:00:00.100000000
diff --git a/tests/validate/videorate/10_to_1fps/flow-expectations/log-videorate-src-expected b/tests/validate/videorate/10_to_1fps/flow-expectations/log-videorate-src-expected
index af1bf7db9e..b0bdcc14df 100644
--- a/tests/validate/videorate/10_to_1fps/flow-expectations/log-videorate-src-expected
+++ b/tests/validate/videorate/10_to_1fps/flow-expectations/log-videorate-src-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, 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 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=5074004a070c85d97cc9f58fab273813c95b748c, pts=0:00:00.000000000, dur=0:00:01.000000000, flags=discont
 event flush-start: (no structure)
diff --git a/tests/validate/videorate/change_rate_reverse_playback/flow-expectations/log-videorate-sink-expected b/tests/validate/videorate/change_rate_reverse_playback/flow-expectations/log-videorate-sink-expected
index 942956c7d6..ea631134a9 100644
--- a/tests/validate/videorate/change_rate_reverse_playback/flow-expectations/log-videorate-sink-expected
+++ b/tests/validate/videorate/change_rate_reverse_playback/flow-expectations/log-videorate-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, framerate=(fraction)10/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)10/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: content-id=0, pts=0:00:00.000000000, dur=0:00:00.100000000, flags=discont
 buffer: content-id=1, pts=0:00:00.100000000, dur=0:00:00.100000000
diff --git a/tests/validate/videorate/change_rate_reverse_playback/flow-expectations/log-videorate-src-expected b/tests/validate/videorate/change_rate_reverse_playback/flow-expectations/log-videorate-src-expected
index aa01bb1a36..44d29b76b9 100644
--- a/tests/validate/videorate/change_rate_reverse_playback/flow-expectations/log-videorate-src-expected
+++ b/tests/validate/videorate/change_rate_reverse_playback/flow-expectations/log-videorate-src-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, framerate=(fraction)10/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)10/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: content-id=0, pts=0:00:00.000000000, dur=0:00:00.100000000, flags=discont
 event flush-start: (no structure)
diff --git a/tests/validate/videorate/change_rate_while_playing/flow-expectations/log-videorate-sink-expected b/tests/validate/videorate/change_rate_while_playing/flow-expectations/log-videorate-sink-expected
index 281c0bc9e9..c793842aee 100644
--- a/tests/validate/videorate/change_rate_while_playing/flow-expectations/log-videorate-sink-expected
+++ b/tests/validate/videorate/change_rate_while_playing/flow-expectations/log-videorate-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, framerate=(fraction)10/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)10/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: content-id=0, pts=0:00:00.000000000, dur=0:00:00.100000000, flags=discont
 buffer: content-id=1, pts=0:00:00.100000000, dur=0:00:00.100000000
diff --git a/tests/validate/videorate/change_rate_while_playing/flow-expectations/log-videorate-src-expected b/tests/validate/videorate/change_rate_while_playing/flow-expectations/log-videorate-src-expected
index 3124182fac..fedbcc4108 100644
--- a/tests/validate/videorate/change_rate_while_playing/flow-expectations/log-videorate-src-expected
+++ b/tests/validate/videorate/change_rate_while_playing/flow-expectations/log-videorate-src-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, framerate=(fraction)10/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)10/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: content-id=0, pts=0:00:00.000000000, dur=0:00:00.100000000, flags=discont
 buffer: content-id=1, pts=0:00:00.100000000, dur=0:00:00.100000000
diff --git a/tests/validate/videorate/rate_0_5/flow-expectations/log-videorate-sink-expected b/tests/validate/videorate/rate_0_5/flow-expectations/log-videorate-sink-expected
index ff2a359484..c46968b7f0 100644
--- a/tests/validate/videorate/rate_0_5/flow-expectations/log-videorate-sink-expected
+++ b/tests/validate/videorate/rate_0_5/flow-expectations/log-videorate-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, 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 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: content-id=0, pts=0:00:00.000000000, dur=0:00:00.033333333, flags=discont
 buffer: content-id=1, pts=0:00:00.033333333, dur=0:00:00.033333333
diff --git a/tests/validate/videorate/rate_0_5/flow-expectations/log-videorate-src-expected b/tests/validate/videorate/rate_0_5/flow-expectations/log-videorate-src-expected
index 8632e997d3..6972bd20aa 100644
--- a/tests/validate/videorate/rate_0_5/flow-expectations/log-videorate-src-expected
+++ b/tests/validate/videorate/rate_0_5/flow-expectations/log-videorate-src-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, 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 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: content-id=0, pts=0:00:00.000000000, dur=0:00:00.033333333, flags=discont
 buffer: content-id=0, pts=0:00:00.033333333, dur=0:00:00.033333333, flags=gap
diff --git a/tests/validate/videorate/rate_0_5_with_decoder/flow-expectations/log-videorate-sink-expected b/tests/validate/videorate/rate_0_5_with_decoder/flow-expectations/log-videorate-sink-expected
index 75fed7040f..86b4a03a05 100644
--- a/tests/validate/videorate/rate_0_5_with_decoder/flow-expectations/log-videorate-sink-expected
+++ b/tests/validate/videorate/rate_0_5_with_decoder/flow-expectations/log-videorate-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, interlace-mode=(string)progressive, multiview-mode=(string)mono, multiview-flags=(GstVideoMultiviewFlagsSet)0:ffffffff:/right-view-first/left-flipped/left-flopped/right-flipped/right-flopped/half-aspect/mixed-mono, pixel-aspect-ratio=(fraction)1/1, chroma-site=(string)jpeg, colorimetry=(string)2:4:5:0, framerate=(fraction)30/1;
+event caps: video/x-raw, chroma-site=(string)jpeg, colorimetry=(string)2:4:5:0, format=(string)I420, framerate=(fraction)30/1, height=(int)240, interlace-mode=(string)progressive, multiview-flags=(GstVideoMultiviewFlagsSet)0:ffffffff:/right-view-first/left-flipped/left-flopped/right-flipped/right-flopped/half-aspect/mixed-mono, 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: content-id=0, pts=0:00:00.000000000, dur=0:00:00.033333333, flags=discont
 buffer: content-id=1, pts=0:00:00.033333333, dur=0:00:00.033333333
diff --git a/tests/validate/videorate/rate_0_5_with_decoder/flow-expectations/log-videorate-src-expected b/tests/validate/videorate/rate_0_5_with_decoder/flow-expectations/log-videorate-src-expected
index 3808aad3e8..79c3f9407a 100644
--- a/tests/validate/videorate/rate_0_5_with_decoder/flow-expectations/log-videorate-src-expected
+++ b/tests/validate/videorate/rate_0_5_with_decoder/flow-expectations/log-videorate-src-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, interlace-mode=(string)progressive, multiview-mode=(string)mono, multiview-flags=(GstVideoMultiviewFlagsSet)0:ffffffff:/right-view-first/left-flipped/left-flopped/right-flipped/right-flopped/half-aspect/mixed-mono, pixel-aspect-ratio=(fraction)1/1, chroma-site=(string)jpeg, colorimetry=(string)2:4:5:0, framerate=(fraction)30/1;
+event caps: video/x-raw, chroma-site=(string)jpeg, colorimetry=(string)2:4:5:0, format=(string)I420, framerate=(fraction)30/1, height=(int)240, interlace-mode=(string)progressive, multiview-flags=(GstVideoMultiviewFlagsSet)0:ffffffff:/right-view-first/left-flipped/left-flopped/right-flipped/right-flopped/half-aspect/mixed-mono, 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: content-id=0, pts=0:00:00.000000000, dur=0:00:00.033333333, flags=discont
 buffer: content-id=0, pts=0:00:00.033333333, dur=0:00:00.033333333, flags=gap
diff --git a/tests/validate/videorate/rate_2_0/flow-expectations/log-videorate-sink-expected b/tests/validate/videorate/rate_2_0/flow-expectations/log-videorate-sink-expected
index 2d38a5e1a0..24bcbcac6c 100644
--- a/tests/validate/videorate/rate_2_0/flow-expectations/log-videorate-sink-expected
+++ b/tests/validate/videorate/rate_2_0/flow-expectations/log-videorate-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, 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 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: content-id=0, pts=0:00:00.000000000, dur=0:00:00.033333333, flags=discont
 buffer: content-id=1, pts=0:00:00.033333333, dur=0:00:00.033333333
diff --git a/tests/validate/videorate/rate_2_0/flow-expectations/log-videorate-src-expected b/tests/validate/videorate/rate_2_0/flow-expectations/log-videorate-src-expected
index 3c3079bdf4..aacf7b9d9b 100644
--- a/tests/validate/videorate/rate_2_0/flow-expectations/log-videorate-src-expected
+++ b/tests/validate/videorate/rate_2_0/flow-expectations/log-videorate-src-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, 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 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: content-id=0, pts=0:00:00.000000000, dur=0:00:00.033333333, flags=discont
 buffer: content-id=2, pts=0:00:00.033333333, dur=0:00:00.033333333
diff --git a/tests/validate/videorate/rate_2_0_with_decoder/flow-expectations/log-videorate-sink-expected b/tests/validate/videorate/rate_2_0_with_decoder/flow-expectations/log-videorate-sink-expected
index 75fed7040f..86b4a03a05 100644
--- a/tests/validate/videorate/rate_2_0_with_decoder/flow-expectations/log-videorate-sink-expected
+++ b/tests/validate/videorate/rate_2_0_with_decoder/flow-expectations/log-videorate-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, interlace-mode=(string)progressive, multiview-mode=(string)mono, multiview-flags=(GstVideoMultiviewFlagsSet)0:ffffffff:/right-view-first/left-flipped/left-flopped/right-flipped/right-flopped/half-aspect/mixed-mono, pixel-aspect-ratio=(fraction)1/1, chroma-site=(string)jpeg, colorimetry=(string)2:4:5:0, framerate=(fraction)30/1;
+event caps: video/x-raw, chroma-site=(string)jpeg, colorimetry=(string)2:4:5:0, format=(string)I420, framerate=(fraction)30/1, height=(int)240, interlace-mode=(string)progressive, multiview-flags=(GstVideoMultiviewFlagsSet)0:ffffffff:/right-view-first/left-flipped/left-flopped/right-flipped/right-flopped/half-aspect/mixed-mono, 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: content-id=0, pts=0:00:00.000000000, dur=0:00:00.033333333, flags=discont
 buffer: content-id=1, pts=0:00:00.033333333, dur=0:00:00.033333333
diff --git a/tests/validate/videorate/rate_2_0_with_decoder/flow-expectations/log-videorate-src-expected b/tests/validate/videorate/rate_2_0_with_decoder/flow-expectations/log-videorate-src-expected
index 3808aad3e8..79c3f9407a 100644
--- a/tests/validate/videorate/rate_2_0_with_decoder/flow-expectations/log-videorate-src-expected
+++ b/tests/validate/videorate/rate_2_0_with_decoder/flow-expectations/log-videorate-src-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, interlace-mode=(string)progressive, multiview-mode=(string)mono, multiview-flags=(GstVideoMultiviewFlagsSet)0:ffffffff:/right-view-first/left-flipped/left-flopped/right-flipped/right-flopped/half-aspect/mixed-mono, pixel-aspect-ratio=(fraction)1/1, chroma-site=(string)jpeg, colorimetry=(string)2:4:5:0, framerate=(fraction)30/1;
+event caps: video/x-raw, chroma-site=(string)jpeg, colorimetry=(string)2:4:5:0, format=(string)I420, framerate=(fraction)30/1, height=(int)240, interlace-mode=(string)progressive, multiview-flags=(GstVideoMultiviewFlagsSet)0:ffffffff:/right-view-first/left-flipped/left-flopped/right-flipped/right-flopped/half-aspect/mixed-mono, 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: content-id=0, pts=0:00:00.000000000, dur=0:00:00.033333333, flags=discont
 buffer: content-id=0, pts=0:00:00.033333333, dur=0:00:00.033333333, flags=gap
diff --git a/tests/validate/videorate/reverse.10_to_1fps/flow-expectations/log-videorate-sink-expected b/tests/validate/videorate/reverse.10_to_1fps/flow-expectations/log-videorate-sink-expected
index 1e1e04a6e6..c44a46d2a7 100644
--- a/tests/validate/videorate/reverse.10_to_1fps/flow-expectations/log-videorate-sink-expected
+++ b/tests/validate/videorate/reverse.10_to_1fps/flow-expectations/log-videorate-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, framerate=(fraction)10/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)10/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=5074004a070c85d97cc9f58fab273813c95b748c, pts=0:00:00.000000000, dur=0:00:00.100000000, flags=discont
 buffer: checksum=d13b763048b4e8a132923ccec0cb0989a33ef44b, pts=0:00:00.100000000, dur=0:00:00.100000000
diff --git a/tests/validate/videorate/reverse.10_to_1fps/flow-expectations/log-videorate-src-expected b/tests/validate/videorate/reverse.10_to_1fps/flow-expectations/log-videorate-src-expected
index 7e0f5ace72..ce1c4eccdb 100644
--- a/tests/validate/videorate/reverse.10_to_1fps/flow-expectations/log-videorate-src-expected
+++ b/tests/validate/videorate/reverse.10_to_1fps/flow-expectations/log-videorate-src-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, 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 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=5074004a070c85d97cc9f58fab273813c95b748c, pts=0:00:00.000000000, dur=0:00:01.000000000, flags=discont
 event flush-start: (no structure)
diff --git a/tests/validate/videorate/reverse.10_to_30fps/flow-expectations/log-videorate-sink-expected b/tests/validate/videorate/reverse.10_to_30fps/flow-expectations/log-videorate-sink-expected
index 33f16db0de..152446098c 100644
--- a/tests/validate/videorate/reverse.10_to_30fps/flow-expectations/log-videorate-sink-expected
+++ b/tests/validate/videorate/reverse.10_to_30fps/flow-expectations/log-videorate-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, framerate=(fraction)10/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)10/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=5074004a070c85d97cc9f58fab273813c95b748c, pts=0:00:00.000000000, dur=0:00:00.100000000, flags=discont
 buffer: checksum=d13b763048b4e8a132923ccec0cb0989a33ef44b, pts=0:00:00.100000000, dur=0:00:00.100000000
diff --git a/tests/validate/videorate/reverse.10_to_30fps/flow-expectations/log-videorate-src-expected b/tests/validate/videorate/reverse.10_to_30fps/flow-expectations/log-videorate-src-expected
index 4299511efd..2c08ac044a 100644
--- a/tests/validate/videorate/reverse.10_to_30fps/flow-expectations/log-videorate-src-expected
+++ b/tests/validate/videorate/reverse.10_to_30fps/flow-expectations/log-videorate-src-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, 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 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=5074004a070c85d97cc9f58fab273813c95b748c, pts=0:00:00.000000000, dur=0:00:00.033333333, flags=discont
 event flush-start: (no structure)
diff --git a/tests/validate/videorate/reverse.1_to_10fps/flow-expectations/log-videorate-sink-expected b/tests/validate/videorate/reverse.1_to_10fps/flow-expectations/log-videorate-sink-expected
index d41aa99fbe..0ddf7fcd8b 100644
--- a/tests/validate/videorate/reverse.1_to_10fps/flow-expectations/log-videorate-sink-expected
+++ b/tests/validate/videorate/reverse.1_to_10fps/flow-expectations/log-videorate-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, 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 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=5074004a070c85d97cc9f58fab273813c95b748c, pts=0:00:00.000000000, dur=0:00:01.000000000, flags=discont
 buffer: checksum=d13b763048b4e8a132923ccec0cb0989a33ef44b, pts=0:00:01.000000000, dur=0:00:01.000000000
diff --git a/tests/validate/videorate/reverse.1_to_10fps/flow-expectations/log-videorate-src-expected b/tests/validate/videorate/reverse.1_to_10fps/flow-expectations/log-videorate-src-expected
index 4d0c027a2f..9909c56c5c 100644
--- a/tests/validate/videorate/reverse.1_to_10fps/flow-expectations/log-videorate-src-expected
+++ b/tests/validate/videorate/reverse.1_to_10fps/flow-expectations/log-videorate-src-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, framerate=(fraction)10/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)10/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=5074004a070c85d97cc9f58fab273813c95b748c, pts=0:00:00.000000000, dur=0:00:00.100000000, flags=discont
 event flush-start: (no structure)
diff --git a/tests/validate/videorate/reverse.30fps/flow-expectations/log-videorate-sink-expected b/tests/validate/videorate/reverse.30fps/flow-expectations/log-videorate-sink-expected
index 4bb21577cf..cc9935c2eb 100644
--- a/tests/validate/videorate/reverse.30fps/flow-expectations/log-videorate-sink-expected
+++ b/tests/validate/videorate/reverse.30fps/flow-expectations/log-videorate-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, 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 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=5074004a070c85d97cc9f58fab273813c95b748c, pts=0:00:00.000000000, dur=0:00:00.033333333, flags=discont
 buffer: checksum=d13b763048b4e8a132923ccec0cb0989a33ef44b, pts=0:00:00.033333333, dur=0:00:00.033333333
diff --git a/tests/validate/videorate/reverse.30fps/flow-expectations/log-videorate-src-expected b/tests/validate/videorate/reverse.30fps/flow-expectations/log-videorate-src-expected
index c0d68b310b..fa89f96cfa 100644
--- a/tests/validate/videorate/reverse.30fps/flow-expectations/log-videorate-src-expected
+++ b/tests/validate/videorate/reverse.30fps/flow-expectations/log-videorate-src-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, 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 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=5074004a070c85d97cc9f58fab273813c95b748c, pts=0:00:00.000000000, dur=0:00:00.033333333, flags=discont
 event flush-start: (no structure)
diff --git a/tests/validate/videorate/reverse.variable_to_10fps/flow-expectations/log-videorate-sink-expected b/tests/validate/videorate/reverse.variable_to_10fps/flow-expectations/log-videorate-sink-expected
index 15157a7d66..bc20ea79e1 100644
--- a/tests/validate/videorate/reverse.variable_to_10fps/flow-expectations/log-videorate-sink-expected
+++ b/tests/validate/videorate/reverse.variable_to_10fps/flow-expectations/log-videorate-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, framerate=(fraction)0/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)0/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=5074004a070c85d97cc9f58fab273813c95b748c, pts=0:00:00.000000000, dur=0:00:00.033333333, flags=discont
 buffer: checksum=d13b763048b4e8a132923ccec0cb0989a33ef44b, pts=0:00:00.033333333, dur=0:00:00.033333333
diff --git a/tests/validate/videorate/reverse.variable_to_10fps/flow-expectations/log-videorate-src-expected b/tests/validate/videorate/reverse.variable_to_10fps/flow-expectations/log-videorate-src-expected
index ddc91317ef..a27c9efb4f 100644
--- a/tests/validate/videorate/reverse.variable_to_10fps/flow-expectations/log-videorate-src-expected
+++ b/tests/validate/videorate/reverse.variable_to_10fps/flow-expectations/log-videorate-src-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, framerate=(fraction)10/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)10/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=5074004a070c85d97cc9f58fab273813c95b748c, pts=0:00:00.000000000, dur=0:00:00.100000000, flags=discont
 event flush-start: (no structure)