tests: Update expectation files with sorted structure fields

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 5f0ca2a..45f4f6b 100644 (file)
--- 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 fda778a..b7a170f 100644 (file)
--- 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 af1bf7d..b0bdcc1 100644 (file)
--- 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 942956c..ea63113 100644 (file)
--- 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 aa01bb1..44d29b7 100644 (file)
--- 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 281c0bc..c793842 100644 (file)
--- 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 3124182..fedbcc4 100644 (file)
--- 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 ff2a359..c46968b 100644 (file)
--- 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 8632e99..6972bd2 100644 (file)
--- 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 75fed70..86b4a03 100644 (file)
--- 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 3808aad..79c3f94 100644 (file)
--- 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 2d38a5e..24bcbca 100644 (file)
--- 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 3c3079b..aacf7b9 100644 (file)
--- 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 75fed70..86b4a03 100644 (file)
--- 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 3808aad..79c3f94 100644 (file)
--- 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 1e1e04a..c44a46d 100644 (file)
--- 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 7e0f5ac..ce1c4ec 100644 (file)
--- 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 33f16db..1524460 100644 (file)
--- 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 4299511..2c08ac0 100644 (file)
--- 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 d41aa99..0ddf7fc 100644 (file)
--- 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 4d0c027..9909c56 100644 (file)
--- 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 4bb2157..cc9935c 100644 (file)
--- 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 c0d68b3..fa89f96 100644 (file)
--- 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 15157a7..bc20ea7 100644 (file)
--- 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 ddc9131..a27c9ef 100644 (file)
--- 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)