Correctly transition to ended state

This fixes transitioning into the ended state if we see
endOfStream from the chunk source whilst in the pending
reset state. Prior to this fix we'd still be pending a
reset, and so readData would never allow EOS to be read
by the consuming renderer.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=157101755

library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java

@@ -336,6 +336,7 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
     nextChunkHolder.clear();
     nextChunkHolder.clear();
 
 
     if (endOfStream) {
     if (endOfStream) {
+      pendingResetPositionUs = C.TIME_UNSET;
       loadingFinished = true;
       loadingFinished = true;
       return true;
       return true;
     }
     }
@@ -389,18 +390,20 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
   }
   }
 
 
   private void discardDownstreamMediaChunks(int primaryStreamReadIndex) {
   private void discardDownstreamMediaChunks(int primaryStreamReadIndex) {
-    while (mediaChunks.size() > 1
-        && mediaChunks.get(1).getFirstSampleIndex(0) <= primaryStreamReadIndex) {
-      mediaChunks.removeFirst();
-    }
-    BaseMediaChunk currentChunk = mediaChunks.getFirst();
-    Format trackFormat = currentChunk.trackFormat;
-    if (!trackFormat.equals(primaryDownstreamTrackFormat)) {
-      eventDispatcher.downstreamFormatChanged(primaryTrackType, trackFormat,
-          currentChunk.trackSelectionReason, currentChunk.trackSelectionData,
-          currentChunk.startTimeUs);
+    if (!mediaChunks.isEmpty()) {
+      while (mediaChunks.size() > 1
+          && mediaChunks.get(1).getFirstSampleIndex(0) <= primaryStreamReadIndex) {
+        mediaChunks.removeFirst();
+      }
+      BaseMediaChunk currentChunk = mediaChunks.getFirst();
+      Format trackFormat = currentChunk.trackFormat;
+      if (!trackFormat.equals(primaryDownstreamTrackFormat)) {
+        eventDispatcher.downstreamFormatChanged(primaryTrackType, trackFormat,
+            currentChunk.trackSelectionReason, currentChunk.trackSelectionData,
+            currentChunk.startTimeUs);
+      }
+      primaryDownstreamTrackFormat = trackFormat;
     }
     }
-    primaryDownstreamTrackFormat = trackFormat;
   }
   }
 
 
   /**
   /**

library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DashMediaSource.java

@@ -625,9 +625,9 @@ public final class DashMediaSource implements MediaSource {
     private final long windowDefaultStartPositionUs;
     private final long windowDefaultStartPositionUs;
     private final DashManifest manifest;
     private final DashManifest manifest;
 
 
-    public DashTimeline(long presentationStartTimeMs, long windowStartTimeMs,
-        int firstPeriodId, long offsetInFirstPeriodUs, long windowDurationUs,
-        long windowDefaultStartPositionUs, DashManifest manifest) {
+    public DashTimeline(long presentationStartTimeMs, long windowStartTimeMs, int firstPeriodId,
+        long offsetInFirstPeriodUs, long windowDurationUs, long windowDefaultStartPositionUs,
+        DashManifest manifest) {
       this.presentationStartTimeMs = presentationStartTimeMs;
       this.presentationStartTimeMs = presentationStartTimeMs;
       this.windowStartTimeMs = windowStartTimeMs;
       this.windowStartTimeMs = windowStartTimeMs;
       this.firstPeriodId = firstPeriodId;
       this.firstPeriodId = firstPeriodId;

library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java

@@ -296,17 +296,19 @@ import java.util.LinkedList;
       return C.RESULT_NOTHING_READ;
       return C.RESULT_NOTHING_READ;
     }
     }
 
 
-    while (mediaChunks.size() > 1 && finishedReadingChunk(mediaChunks.getFirst())) {
-      mediaChunks.removeFirst();
-    }
-    HlsMediaChunk currentChunk = mediaChunks.getFirst();
-    Format trackFormat = currentChunk.trackFormat;
-    if (!trackFormat.equals(downstreamTrackFormat)) {
-      eventDispatcher.downstreamFormatChanged(trackType, trackFormat,
-          currentChunk.trackSelectionReason, currentChunk.trackSelectionData,
-          currentChunk.startTimeUs);
+    if (!mediaChunks.isEmpty()) {
+      while (mediaChunks.size() > 1 && finishedReadingChunk(mediaChunks.getFirst())) {
+        mediaChunks.removeFirst();
+      }
+      HlsMediaChunk currentChunk = mediaChunks.getFirst();
+      Format trackFormat = currentChunk.trackFormat;
+      if (!trackFormat.equals(downstreamTrackFormat)) {
+        eventDispatcher.downstreamFormatChanged(trackType, trackFormat,
+            currentChunk.trackSelectionReason, currentChunk.trackSelectionData,
+            currentChunk.startTimeUs);
+      }
+      downstreamTrackFormat = trackFormat;
     }
     }
-    downstreamTrackFormat = trackFormat;
 
 
     return sampleQueues.valueAt(group).readData(formatHolder, buffer, requireFormat,
     return sampleQueues.valueAt(group).readData(formatHolder, buffer, requireFormat,
         loadingFinished, lastSeekPositionUs);
         loadingFinished, lastSeekPositionUs);
@@ -348,6 +350,7 @@ import java.util.LinkedList;
     nextChunkHolder.clear();
     nextChunkHolder.clear();
 
 
     if (endOfStream) {
     if (endOfStream) {
+      pendingResetPositionUs = C.TIME_UNSET;
       loadingFinished = true;
       loadingFinished = true;
       return true;
       return true;
     }
     }