Support relative MPD.Location URIs

#minor-release Issue: #9939 PiperOrigin-RevId: 426394339
google · Feb 7, 2022 · 13626a1 · 13626a1
1 parent 0c2e77d
commit 13626a1
Show file tree

Hide file tree

Showing 5 changed files with 75 additions and 1 deletion.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -103,6 +103,8 @@
         priority in manifests that do not declare the dvb namespace. This
         prevents the exclusion logic to exclude base URL when they actually
         should be used as a fallback base URL.
+    *   Support relative `MPD.Location` URLs
+        ([#9939](https://github.com/google/ExoPlayer/issues/9939)).
 *   HLS:
     *   Use chunkless preparation by default to improve start up time. If your
         renditions contain muxed closed-caption tracks that are *not* declared

diff --git a/.../src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/.../src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java
@@ -161,7 +161,7 @@ protected DashManifest parseMediaPresentationDescription(XmlPullParser xpp, Uri
       } else if (XmlPullParserUtil.isStartTag(xpp, "UTCTiming")) {
         utcTiming = parseUtcTiming(xpp);
       } else if (XmlPullParserUtil.isStartTag(xpp, "Location")) {
-        location = Uri.parse(xpp.nextText());
+        location = UriUtil.resolveToUri(documentBaseUri.toString(), xpp.nextText());
       } else if (XmlPullParserUtil.isStartTag(xpp, "ServiceDescription")) {
         serviceDescription = parseServiceDescription(xpp);
       } else if (XmlPullParserUtil.isStartTag(xpp, "Period") && !seenEarlyAccessPeriod) {

diff --git a/.../test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java b/.../test/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParserTest.java
@@ -46,6 +46,10 @@
 public class DashManifestParserTest {
 
   private static final String SAMPLE_MPD_LIVE = "media/mpd/sample_mpd_live";
+  private static final String SAMPLE_MPD_LIVE_LOCATION_REDIRECT_RELATIVE =
+      "media/mpd/sample_mpd_live_location_redirect_relative";
+  private static final String SAMPLE_MPD_LIVE_LOCATION_REDIRECT_ABSOLUTE =
+      "media/mpd/sample_mpd_live_location_redirect_absolute";
   private static final String SAMPLE_MPD_UNKNOWN_MIME_TYPE =
       "media/mpd/sample_mpd_unknown_mime_type";
   private static final String SAMPLE_MPD_SEGMENT_TEMPLATE = "media/mpd/sample_mpd_segment_template";
@@ -201,6 +205,32 @@ public void parseMediaPresentationDescription_programInformation() throws IOExce
     assertThat(manifest.programInformation).isEqualTo(expectedProgramInformation);
   }
 
+  @Test
+  public void parseMediaPresentationDescription_locationRedirectRelative() throws IOException {
+    DashManifestParser parser = new DashManifestParser();
+    DashManifest manifest =
+        parser.parse(
+            Uri.parse("https://example.com/a/b/test.mpd"),
+            TestUtil.getInputStream(
+                ApplicationProvider.getApplicationContext(),
+                SAMPLE_MPD_LIVE_LOCATION_REDIRECT_RELATIVE));
+    Uri expectedLocation = Uri.parse("https://example.com/a/relative/redirect.mpd");
+    assertThat(manifest.location).isEqualTo(expectedLocation);
+  }
+
+  @Test
+  public void parseMediaPresentationDescription_locationRedirectAbsolute() throws IOException {
+    DashManifestParser parser = new DashManifestParser();
+    DashManifest manifest =
+        parser.parse(
+            Uri.parse("https://example.com/a/b/test.mpd"),
+            TestUtil.getInputStream(
+                ApplicationProvider.getApplicationContext(),
+                SAMPLE_MPD_LIVE_LOCATION_REDIRECT_ABSOLUTE));
+    Uri expectedLocation = Uri.parse("https://example2.com/absolute/redirect.mpd");
+    assertThat(manifest.location).isEqualTo(expectedLocation);
+  }
+
   @Test
   public void parseMediaPresentationDescription_images() throws IOException {
     DashManifestParser parser = new DashManifestParser();

diff --git a/testdata/src/test/assets/media/mpd/sample_mpd_live_location_redirect_absolute b/testdata/src/test/assets/media/mpd/sample_mpd_live_location_redirect_absolute
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MPD
+		type="dynamic"
+		suggestedPresentationDelay="PT2S"
+		availabilityStartTime="2020-01-01T00:00:00Z"
+		minimumUpdatePeriod="PT4M"
+		timeShiftBufferDepth="PT8.0S">
+	<Location>https://example2.com/absolute/redirect.mpd</Location>
+	<Period start="PT0.0S">
+		<AdaptationSet contentType="video">
+			<Representation id="0" mimeType="video/mp4">
+				<SegmentTemplate
+						timescale="1000000"
+						duration="2000000"
+						availabilityTimeOffset="2"
+						startNumber="1">
+				</SegmentTemplate>
+			</Representation>
+		</AdaptationSet>
+	</Period>
+</MPD>
diff --git a/testdata/src/test/assets/media/mpd/sample_mpd_live_location_redirect_relative b/testdata/src/test/assets/media/mpd/sample_mpd_live_location_redirect_relative
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<MPD
+		type="dynamic"
+		suggestedPresentationDelay="PT2S"
+		availabilityStartTime="2020-01-01T00:00:00Z"
+		minimumUpdatePeriod="PT4M"
+		timeShiftBufferDepth="PT8.0S">
+	<Location>../relative/redirect.mpd</Location>
+	<Period start="PT0.0S">
+		<AdaptationSet contentType="video">
+			<Representation id="0" mimeType="video/mp4">
+				<SegmentTemplate
+						timescale="1000000"
+						duration="2000000"
+						availabilityTimeOffset="2"
+						startNumber="1">
+				</SegmentTemplate>
+			</Representation>
+		</AdaptationSet>
+	</Period>
+</MPD>