Rework application of Mpd.Location + fix test.

library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java

@@ -298,10 +298,6 @@ public class DashChunkSource implements ChunkSource {
 
 
     if (finishedCurrentManifest && (android.os.SystemClock.elapsedRealtime()
     if (finishedCurrentManifest && (android.os.SystemClock.elapsedRealtime()
         > manifestFetcher.getManifestLoadTimestamp() + minUpdatePeriod)) {
         > manifestFetcher.getManifestLoadTimestamp() + minUpdatePeriod)) {
-      String newManifestURL = currentManifest.location;
-      if (newManifestURL != null) {
-          manifestFetcher.updateManifestUrl(newManifestURL);
-      }
       manifestFetcher.requestRefresh();
       manifestFetcher.requestRefresh();
     }
     }
   }
   }
@@ -592,8 +588,8 @@ public class DashChunkSource implements ChunkSource {
     Period period = new Period(null, firstRepresentation.periodStartMs,
     Period period = new Period(null, firstRepresentation.periodStartMs,
         firstRepresentation.periodDurationMs, Collections.singletonList(adaptationSet));
         firstRepresentation.periodDurationMs, Collections.singletonList(adaptationSet));
     long duration = firstRepresentation.periodDurationMs - firstRepresentation.periodStartMs;
     long duration = firstRepresentation.periodDurationMs - firstRepresentation.periodStartMs;
-    return new MediaPresentationDescription(-1, duration, -1, false, -1, -1, null,
-        Collections.singletonList(period), null);
+    return new MediaPresentationDescription(-1, duration, -1, false, -1, -1, null, null,
+        Collections.singletonList(period));
   }
   }
 
 
   private static class RepresentationHolder {
   private static class RepresentationHolder {

library/src/main/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescription.java

@@ -15,13 +15,15 @@
  */
  */
 package com.google.android.exoplayer.dash.mpd;
 package com.google.android.exoplayer.dash.mpd;
 
 
+import com.google.android.exoplayer.util.ManifestFetcher.RedirectingManifest;
+
 import java.util.Collections;
 import java.util.Collections;
 import java.util.List;
 import java.util.List;
 
 
 /**
 /**
  * Represents a DASH media presentation description (mpd).
  * Represents a DASH media presentation description (mpd).
  */
  */
-public class MediaPresentationDescription {
+public class MediaPresentationDescription implements RedirectingManifest {
 
 
   public final long availabilityStartTime;
   public final long availabilityStartTime;
 
 
@@ -35,15 +37,15 @@ public class MediaPresentationDescription {
 
 
   public final long timeShiftBufferDepth;
   public final long timeShiftBufferDepth;
 
 
-  public final List<Period> periods;
-
   public final UtcTimingElement utcTiming;
   public final UtcTimingElement utcTiming;
 
 
   public final String location;
   public final String location;
 
 
+  public final List<Period> periods;
+
   public MediaPresentationDescription(long availabilityStartTime, long duration, long minBufferTime,
   public MediaPresentationDescription(long availabilityStartTime, long duration, long minBufferTime,
       boolean dynamic, long minUpdatePeriod, long timeShiftBufferDepth, UtcTimingElement utcTiming,
       boolean dynamic, long minUpdatePeriod, long timeShiftBufferDepth, UtcTimingElement utcTiming,
-      List<Period> periods, String location) {
+      String location, List<Period> periods) {
     this.availabilityStartTime = availabilityStartTime;
     this.availabilityStartTime = availabilityStartTime;
     this.duration = duration;
     this.duration = duration;
     this.minBufferTime = minBufferTime;
     this.minBufferTime = minBufferTime;
@@ -51,8 +53,13 @@ public class MediaPresentationDescription {
     this.minUpdatePeriod = minUpdatePeriod;
     this.minUpdatePeriod = minUpdatePeriod;
     this.timeShiftBufferDepth = timeShiftBufferDepth;
     this.timeShiftBufferDepth = timeShiftBufferDepth;
     this.utcTiming = utcTiming;
     this.utcTiming = utcTiming;
-    this.periods = Collections.unmodifiableList(periods);
     this.location = location;
     this.location = location;
+    this.periods = Collections.unmodifiableList(periods);
+  }
+
+  @Override
+  public String getNextManifestUrl() {
+    return location;
   }
   }
 
 
 }
 }

library/src/main/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParser.java

@@ -128,15 +128,15 @@ public class MediaPresentationDescriptionParser extends DefaultHandler
     } while (!isEndTag(xpp, "MPD"));
     } while (!isEndTag(xpp, "MPD"));
 
 
     return buildMediaPresentationDescription(availabilityStartTime, durationMs, minBufferTimeMs,
     return buildMediaPresentationDescription(availabilityStartTime, durationMs, minBufferTimeMs,
-        dynamic, minUpdateTimeMs, timeShiftBufferDepthMs, utcTiming, periods, location);
+        dynamic, minUpdateTimeMs, timeShiftBufferDepthMs, utcTiming, location, periods);
   }
   }
 
 
   protected MediaPresentationDescription buildMediaPresentationDescription(
   protected MediaPresentationDescription buildMediaPresentationDescription(
       long availabilityStartTime, long durationMs, long minBufferTimeMs, boolean dynamic,
       long availabilityStartTime, long durationMs, long minBufferTimeMs, boolean dynamic,
       long minUpdateTimeMs, long timeShiftBufferDepthMs, UtcTimingElement utcTiming,
       long minUpdateTimeMs, long timeShiftBufferDepthMs, UtcTimingElement utcTiming,
-      List<Period> periods, String location) {
+      String location, List<Period> periods) {
     return new MediaPresentationDescription(availabilityStartTime, durationMs, minBufferTimeMs,
     return new MediaPresentationDescription(availabilityStartTime, durationMs, minBufferTimeMs,
-        dynamic, minUpdateTimeMs, timeShiftBufferDepthMs, utcTiming, periods, location);
+        dynamic, minUpdateTimeMs, timeShiftBufferDepthMs, utcTiming, location, periods);
   }
   }
 
 
   protected UtcTimingElement parseUtcTiming(XmlPullParser xpp) {
   protected UtcTimingElement parseUtcTiming(XmlPullParser xpp) {

library/src/main/java/com/google/android/exoplayer/util/ManifestFetcher.java

@@ -23,6 +23,7 @@ import com.google.android.exoplayer.upstream.UriLoadable;
 import android.os.Handler;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Looper;
 import android.os.SystemClock;
 import android.os.SystemClock;
+import android.text.TextUtils;
 import android.util.Pair;
 import android.util.Pair;
 
 
 import java.io.IOException;
 import java.io.IOException;
@@ -83,6 +84,20 @@ public class ManifestFetcher<T> implements Loader.Callback {
 
 
   }
   }
 
 
+  /**
+   * Interface for manifests that are able to specify that subsequent loads should use a different
+   * URL.
+   */
+  public interface RedirectingManifest {
+
+    /**
+     * Returns the URL from which subsequent manifests should be requested, or null to continue
+     * using the current URL.
+     */
+    public String getNextManifestUrl();
+
+  }
+
   private final UriLoadable.Parser<T> parser;
   private final UriLoadable.Parser<T> parser;
   private final UriDataSource uriDataSource;
   private final UriDataSource uriDataSource;
   private final Handler eventHandler;
   private final Handler eventHandler;
@@ -237,6 +252,14 @@ public class ManifestFetcher<T> implements Loader.Callback {
     loadExceptionCount = 0;
     loadExceptionCount = 0;
     loadException = null;
     loadException = null;
 
 
+    if (manifest instanceof RedirectingManifest) {
+      RedirectingManifest redirectingManifest = (RedirectingManifest) manifest;
+      String nextLocation = redirectingManifest.getNextManifestUrl();
+      if (!TextUtils.isEmpty(nextLocation)) {
+        manifestUrl = nextLocation;
+      }
+    }
+
     notifyManifestRefreshed();
     notifyManifestRefreshed();
   }
   }
 
 

library/src/test/java/com/google/android/exoplayer/dash/DashChunkSourceTest.java

@@ -248,7 +248,7 @@ public class DashChunkSourceTest extends InstrumentationTestCase {
     long duration = (live) ? TrackRenderer.UNKNOWN_TIME_US
     long duration = (live) ? TrackRenderer.UNKNOWN_TIME_US
         : firstRepresentation.periodDurationMs - firstRepresentation.periodStartMs;
         : firstRepresentation.periodDurationMs - firstRepresentation.periodStartMs;
     return new MediaPresentationDescription(AVAILABILITY_START_TIME, duration, -1, live, -1, -1,
     return new MediaPresentationDescription(AVAILABILITY_START_TIME, duration, -1, live, -1, -1,
-        null, Collections.singletonList(period));
+        null, null, Collections.singletonList(period));
   }
   }
 
 
   private static MediaPresentationDescription generateVodMpd() {
   private static MediaPresentationDescription generateVodMpd() {