When multiple BaseURL elements are present, prefer the first one.

Issue: #771
google · Sep 10, 2015 · a7ba393 · a7ba393
1 parent 4a29be4
commit a7ba393
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/...c/main/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParser.java b/...c/main/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParser.java
@@ -117,10 +117,14 @@ protected MediaPresentationDescription parseMediaPresentationDescription(XmlPull
     List<Period> periods = new ArrayList<>();
     long nextPeriodStartMs = dynamic ? -1 : 0;
     boolean seenEarlyAccessPeriod = false;
+    boolean seenFirstBaseUrl = false;
     do {
       xpp.next();
       if (isStartTag(xpp, "BaseURL")) {
-        baseUrl = parseBaseUrl(xpp, baseUrl);
+        if (!seenFirstBaseUrl) {
+          baseUrl = parseBaseUrl(xpp, baseUrl);
+          seenFirstBaseUrl = true;
+        }
       } else if (isStartTag(xpp, "UTCTiming")) {
         utcTiming = parseUtcTiming(xpp);
       } else if (isStartTag(xpp, "Location")) {
@@ -183,10 +187,14 @@ protected Pair<Period, Long> parsePeriod(XmlPullParser xpp, String baseUrl, long
     long durationMs = parseDuration(xpp, "duration", -1);
     SegmentBase segmentBase = null;
     List<AdaptationSet> adaptationSets = new ArrayList<>();
+    boolean seenFirstBaseUrl = false;
     do {
       xpp.next();
       if (isStartTag(xpp, "BaseURL")) {
-        baseUrl = parseBaseUrl(xpp, baseUrl);
+        if (!seenFirstBaseUrl) {
+          baseUrl = parseBaseUrl(xpp, baseUrl);
+          seenFirstBaseUrl = true;
+        }
       } else if (isStartTag(xpp, "AdaptationSet")) {
         adaptationSets.add(parseAdaptationSet(xpp, baseUrl, segmentBase));
       } else if (isStartTag(xpp, "SegmentBase")) {
@@ -223,10 +231,14 @@ protected AdaptationSet parseAdaptationSet(XmlPullParser xpp, String baseUrl,
 
     ContentProtectionsBuilder contentProtectionsBuilder = new ContentProtectionsBuilder();
     List<Representation> representations = new ArrayList<>();
+    boolean seenFirstBaseUrl = false;
     do {
       xpp.next();
       if (isStartTag(xpp, "BaseURL")) {
-        baseUrl = parseBaseUrl(xpp, baseUrl);
+        if (!seenFirstBaseUrl) {
+          baseUrl = parseBaseUrl(xpp, baseUrl);
+          seenFirstBaseUrl = true;
+        }
       } else if (isStartTag(xpp, "ContentProtection")) {
         contentProtectionsBuilder.addAdaptationSetProtection(parseContentProtection(xpp));
       } else if (isStartTag(xpp, "ContentComponent")) {
@@ -352,10 +364,14 @@ protected Representation parseRepresentation(XmlPullParser xpp, String baseUrl,
     int audioSamplingRate = parseInt(xpp, "audioSamplingRate", adaptationSetAudioSamplingRate);
     String language = adaptationSetLanguage;
 
+    boolean seenFirstBaseUrl = false;
     do {
       xpp.next();
       if (isStartTag(xpp, "BaseURL")) {
-        baseUrl = parseBaseUrl(xpp, baseUrl);
+        if (!seenFirstBaseUrl) {
+          baseUrl = parseBaseUrl(xpp, baseUrl);
+          seenFirstBaseUrl = true;
+        }
       } else if (isStartTag(xpp, "AudioChannelConfiguration")) {
         audioChannels = parseAudioChannelConfiguration(xpp);
       } else if (isStartTag(xpp, "SegmentBase")) {