From 015566daec774b19fa8eadce2361aa6814b8e7a0 Mon Sep 17 00:00:00 2001
From: Alex Ashley <bugzilla@ashley-family.net>
Date: Tue, 11 Dec 2018 14:43:21 +0000
Subject: [PATCH] tests/dash_mpd: take account of Period start in expected
 timestamps

The start of each segment is relative to the Period start, minus
the presentation time offset.

As specified in section 5.3.9.6 of the MPEG DASH specification:
	The value of the @t attribute minus the value of the
	@presentationTimeOffset specifies the MPD start time of
	the first Segment in the series.

Several tests use a Period@start value of 10 seconds, which either
needs to be taken into account when calculating expected timestamps
or have that attribute removed.

This commit uses a mix of updating the timestamps and removing the
start attribute, so that both the case of its presence and absence
is tested.
---
 tests/check/elements/dash_mpd.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/check/elements/dash_mpd.c b/tests/check/elements/dash_mpd.c
index d9455fa..d9d1432 100644
--- a/tests/check/elements/dash_mpd.c
+++ b/tests/check/elements/dash_mpd.c
@@ -4503,7 +4503,7 @@ GST_START_TEST (dash_mpdparser_inherited_segmentURL)
       "     profiles=\"urn:mpeg:dash:profile:isoff-main:2011\""
       "     availabilityStartTime=\"2015-03-24T0:0:0\""
       "     mediaPresentationDuration=\"P0Y0M0DT3H3M30S\">"
-      "  <Period start=\"P0Y0M0DT0H0M10S\">"
+      "  <Period>"
       "    <AdaptationSet mimeType=\"video/mp4\">"
       "      <SegmentList duration=\"100\">"
       "        <SegmentURL media=\"TestMediaAdaptation\""
@@ -4638,7 +4638,7 @@ GST_START_TEST (dash_mpdparser_segment_list)
    * We expect it to be limited to period duration.
    */
   expectedDuration = duration_to_ms (0, 0, 0, 3, 3, 20, 0);
-  expectedTimestamp = duration_to_ms (0, 0, 0, 0, 0, 0, 0);
+  expectedTimestamp = duration_to_ms (0, 0, 0, 0, 0, 10, 0);
 
   ret = gst_mpd_client_get_next_fragment (mpdclient, 0, &fragment);
   assert_equals_int (ret, TRUE);
@@ -4834,7 +4834,7 @@ GST_START_TEST (dash_mpdparser_segment_timeline)
 
   /* expected duration of the next fragment */
   expectedDuration = duration_to_ms (0, 0, 0, 0, 0, 2, 0);
-  expectedTimestamp = duration_to_ms (0, 0, 0, 0, 0, 3, 0);
+  expectedTimestamp = duration_to_ms (0, 0, 0, 0, 0, 13, 0);
 
   ret = gst_mpd_client_get_next_fragment (mpdclient, 0, &fragment);
   assert_equals_int (ret, TRUE);
@@ -4902,7 +4902,7 @@ GST_START_TEST (dash_mpdparser_segment_timeline)
 
   /* third segment has a small gap after the second ends  (t=10) */
   expectedDuration = duration_to_ms (0, 0, 0, 0, 0, 3, 0);
-  expectedTimestamp = duration_to_ms (0, 0, 0, 0, 0, 10, 0);
+  expectedTimestamp = duration_to_ms (0, 0, 0, 0, 0, 20, 0);
 
   /* check third segment */
   ret = gst_mpd_client_get_next_fragment (mpdclient, 0, &fragment);
@@ -4967,7 +4967,7 @@ GST_START_TEST (dash_mpdparser_multiple_inherited_segmentURL)
       " profiles=\"urn:mpeg:dash:profile:isoff-main:2011\""
       " availabilityStartTime=\"2015-03-24T0:0:0\""
       " mediaPresentationDuration=\"P0Y0M0DT0H0M30S\">"
-      "<Period start=\"P0Y0M0DT0H0M10S\">"
+      "<Period>"
       "  <AdaptationSet mimeType=\"video/mp4\">"
       "    <SegmentList duration=\"5\">"
       "      <SegmentURL"
@@ -5135,7 +5135,7 @@ GST_START_TEST (dash_mpdparser_multipleSegmentURL)
   fail_if (activeStream == NULL);
 
   expectedDuration = duration_to_ms (0, 0, 0, 0, 0, 20, 0);
-  expectedTimestamp = duration_to_ms (0, 0, 0, 0, 0, 0, 0);
+  expectedTimestamp = duration_to_ms (0, 0, 0, 0, 0, 10, 0);
 
   /* the representation contains 2 segments. The first is partially
    * clipped, and the second entirely (and thus discarded).
-- 
2.7.4