From 5c05b4942e6bb1490b7fa50c1e8a18ec9a0c5a9d Mon Sep 17 00:00:00 2001
From: Thibault Saunier <tsaunier@igalia.com>
Date: Tue, 5 May 2020 23:03:36 -0400
Subject: [PATCH] tests: Stop recording segment position in seek_with_stop

There are two valid timing in GstAggregator where the segment event
is pushed before GstAggregator sets its srcpad->segment.position in
gst_aggregator_pad_chain_internal. Segment.position is basically
a helper field for internal elements use so we should not require
a specific value here as we are not checking a particular element
behavior.

Fixes https://gitlab.freedesktop.org/gstreamer/gst-editing-services/-/issues/106

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-editing-services/-/merge_requests/174>
---
 tests/check/scenarios/seek_with_stop.validatetest      |  4 ++--
 .../flow-expectations/log-audiosink-sink-expected      | 10 +++++-----
 .../flow-expectations/log-videosink-sink-expected      | 10 +++++-----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/check/scenarios/seek_with_stop.validatetest b/tests/check/scenarios/seek_with_stop.validatetest
index 58fa43cb48c..e6d85d0f750 100644
--- a/tests/check/scenarios/seek_with_stop.validatetest
+++ b/tests/check/scenarios/seek_with_stop.validatetest
@@ -7,8 +7,8 @@ meta,
     handles-states=true,
     ignore-eos=true,
     configs = {
-        "$(validateflow), pad=videosink:sink, record-buffers=true, ignored-fields=\"stream-start={stream-id,group-id,stream}\"",
-        "$(validateflow), pad=audiosink:sink, record-buffers=true, ignored-fields=\"stream-start={stream-id,group-id,stream}\"",
+        "$(validateflow), pad=videosink:sink, record-buffers=true, ignored-fields=\"stream-start={stream-id,group-id,stream}, segment={position,}\"",
+        "$(validateflow), pad=audiosink:sink, record-buffers=true, ignored-fields=\"stream-start={stream-id,group-id,stream}, segment={position,}\"",
     }
 
 add-clip, name=c0, asset-id=GESTestClip, layer-priority=0, type=GESTestClip, start=0, duration=1.0
diff --git a/tests/check/scenarios/seek_with_stop/flow-expectations/log-audiosink-sink-expected b/tests/check/scenarios/seek_with_stop/flow-expectations/log-audiosink-sink-expected
index f484fef98bf..c2daae6338b 100644
--- a/tests/check/scenarios/seek_with_stop/flow-expectations/log-audiosink-sink-expected
+++ b/tests/check/scenarios/seek_with_stop/flow-expectations/log-audiosink-sink-expected
@@ -1,10 +1,10 @@
 event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE;
 event caps: audio/x-raw, rate=(int)44100, format=(string)S32LE, channels=(int)2, layout=(string)interleaved, channel-mask=(bitmask)0x0000000000000003;
-event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:01.000000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.000000000
+event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:01.000000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000
 buffer: pts=0:00:00.000000000, dur=0:00:00.010000000
 event flush-start: (no structure)
 event flush-stop: GstEventFlushStop, reset-time=(boolean)true;
-event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:00.500000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.000000000
+event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:00.500000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000
 buffer: pts=0:00:00.000000000, dur=0:00:00.010000000
 buffer: pts=0:00:00.010000000, dur=0:00:00.010000000
 buffer: pts=0:00:00.020000000, dur=0:00:00.010000000
@@ -59,7 +59,7 @@ event gap: GstEventGap, timestamp=(guint64)500000000, duration=(guint64)18446744
 event eos: (no structure)
 event flush-start: (no structure)
 event flush-stop: GstEventFlushStop, reset-time=(boolean)true;
-event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:00.500000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.000000000
+event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:00.500000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000
 buffer: pts=0:00:00.000000000, dur=0:00:00.010000000
 buffer: pts=0:00:00.010000000, dur=0:00:00.010000000
 buffer: pts=0:00:00.020000000, dur=0:00:00.010000000
@@ -114,7 +114,7 @@ event gap: GstEventGap, timestamp=(guint64)500000000, duration=(guint64)18446744
 event eos: (no structure)
 event flush-start: (no structure)
 event flush-stop: GstEventFlushStop, reset-time=(boolean)true;
-event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:01.000000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000, position=0:00:00.000000000
+event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:01.000000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000
 buffer: pts=0:00:00.000000000, dur=0:00:00.010000000
 buffer: pts=0:00:00.010000000, dur=0:00:00.010000000
 buffer: pts=0:00:00.020000000, dur=0:00:00.010000000
@@ -219,7 +219,7 @@ event gap: GstEventGap, timestamp=(guint64)1000000000, duration=(guint64)1844674
 event eos: (no structure)
 event flush-start: (no structure)
 event flush-stop: GstEventFlushStop, reset-time=(boolean)true;
-event segment: format=TIME, start=0:00:01.000000000, offset=0:00:00.000000000, stop=0:00:01.500000000, flags=0x01, time=0:00:01.000000000, base=0:00:00.000000000, position=0:00:01.000000000
+event segment: format=TIME, start=0:00:01.000000000, offset=0:00:00.000000000, stop=0:00:01.500000000, flags=0x01, time=0:00:01.000000000, base=0:00:00.000000000
 buffer: pts=0:00:01.000000000, dur=0:00:00.010000000
 buffer: pts=0:00:01.010000000, dur=0:00:00.010000000
 buffer: pts=0:00:01.020000000, dur=0:00:00.010000000
diff --git a/tests/check/scenarios/seek_with_stop/flow-expectations/log-videosink-sink-expected b/tests/check/scenarios/seek_with_stop/flow-expectations/log-videosink-sink-expected
index 41028541e9c..1efd0485651 100644
--- a/tests/check/scenarios/seek_with_stop/flow-expectations/log-videosink-sink-expected
+++ b/tests/check/scenarios/seek_with_stop/flow-expectations/log-videosink-sink-expected
@@ -1,10 +1,10 @@
 event stream-start: GstEventStreamStart, flags=(GstStreamFlags)GST_STREAM_FLAG_NONE;
 event caps: video/x-raw, format=(string)I420, width=(int)1280, height=(int)720, framerate=(fraction)30/1, chroma-site=(string)mpeg2, colorimetry=(string)bt709;
-event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:01.000000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000, position=none
+event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:01.000000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000
 buffer: pts=0:00:00.000000000, dur=0:00:00.033333333
 event flush-start: (no structure)
 event flush-stop: GstEventFlushStop, reset-time=(boolean)true;
-event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:00.500000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000, position=none
+event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:00.500000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000
 buffer: pts=0:00:00.000000000, dur=0:00:00.033333333
 buffer: pts=0:00:00.033333333, dur=0:00:00.033333334
 buffer: pts=0:00:00.066666667, dur=0:00:00.033333333
@@ -23,7 +23,7 @@ buffer: pts=0:00:00.466666667, dur=0:00:00.033333333
 event eos: (no structure)
 event flush-start: (no structure)
 event flush-stop: GstEventFlushStop, reset-time=(boolean)true;
-event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:00.500000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000, position=none
+event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:00.500000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000
 buffer: pts=0:00:00.000000000, dur=0:00:00.033333333
 buffer: pts=0:00:00.033333333, dur=0:00:00.033333334
 buffer: pts=0:00:00.066666667, dur=0:00:00.033333333
@@ -42,7 +42,7 @@ buffer: pts=0:00:00.466666667, dur=0:00:00.033333333
 event eos: (no structure)
 event flush-start: (no structure)
 event flush-stop: GstEventFlushStop, reset-time=(boolean)true;
-event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:01.000000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000, position=none
+event segment: format=TIME, start=0:00:00.000000000, offset=0:00:00.000000000, stop=0:00:01.000000000, flags=0x01, time=0:00:00.000000000, base=0:00:00.000000000
 buffer: pts=0:00:00.000000000, dur=0:00:00.033333333
 buffer: pts=0:00:00.033333333, dur=0:00:00.033333334
 buffer: pts=0:00:00.066666667, dur=0:00:00.033333333
@@ -76,7 +76,7 @@ buffer: pts=0:00:00.966666667, dur=0:00:00.033333333
 event eos: (no structure)
 event flush-start: (no structure)
 event flush-stop: GstEventFlushStop, reset-time=(boolean)true;
-event segment: format=TIME, start=0:00:01.000000000, offset=0:00:00.000000000, stop=0:00:01.500000000, flags=0x01, time=0:00:01.000000000, base=0:00:00.000000000, position=none
+event segment: format=TIME, start=0:00:01.000000000, offset=0:00:00.000000000, stop=0:00:01.500000000, flags=0x01, time=0:00:01.000000000, base=0:00:00.000000000
 buffer: pts=0:00:01.000000000, dur=0:00:00.033333333
 buffer: pts=0:00:01.033333333, dur=0:00:00.033333334
 buffer: pts=0:00:01.066666667, dur=0:00:00.033333333