From 5de7638f74704b980a2c0f565ade86d17eadb633 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Tue, 17 Nov 2015 15:42:40 +0000
Subject: [PATCH] Handle laggy manifest servers.  Don't reprocess discarded
 manifests twice.

---
 .../android/exoplayer/dash/DashChunkSource.java    | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java b/library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java
index a7e13ddc87..f28bde2899 100644
--- a/library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java
+++ b/library/src/main/java/com/google/android/exoplayer/dash/DashChunkSource.java
@@ -121,6 +121,7 @@ public class DashChunkSource implements ChunkSource, Output {
   private final boolean live;
 
   private MediaPresentationDescription currentManifest;
+  private MediaPresentationDescription processedManifest;
   private ExposedTrack enabledTrack;
   private int nextPeriodHolderIndex;
   private TimeRange availableRange;
@@ -322,8 +323,11 @@ public class DashChunkSource implements ChunkSource, Output {
     }
 
     MediaPresentationDescription newManifest = manifestFetcher.getManifest();
-    if (currentManifest != newManifest && newManifest != null) {
+    if (newManifest != null && newManifest != processedManifest) {
       processManifest(newManifest);
+      // Manifests may be rejected, so the new manifest may not become the next currentManifest.
+      // Track a manifest has been processed to avoid processing twice when it was discarded.
+      processedManifest = newManifest;
     }
 
     // TODO: This is a temporary hack to avoid constantly refreshing the MPD in cases where
@@ -727,6 +731,14 @@ public class DashChunkSource implements ChunkSource, Output {
       periodHolders.remove(periodHolder.localIndex);
     }
 
+    // After discarding old periods, we should never have more periods than listed in the new
+    // manifest.  That would mean that a previously announced period is no longer advertised.  If
+    // this condition occurs, assume that we are hitting a manifest server that is out of sync and
+    // behind, discard this manifest, and try again later.
+    if (periodHolders.size() > manifest.getPeriodCount()) {
+      return;
+    }
+
     // Update existing periods. Only the first and last periods can change.
     try {
       int periodHolderCount = periodHolders.size();