From 0add067eaad1bfb5f035b63de14222e289250f0a Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 26 May 2020 13:17:38 +0100
Subject: [PATCH] Make fallback value more explicitly unset.

PiperOrigin-RevId: 313171970
---
 .../android/exoplayer2/source/chunk/ChunkSampleStream.java | 4 ++--
 .../exoplayer2/source/hls/HlsSampleStreamWrapper.java      | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java
index b73a086009..6efe25420c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSampleStream.java
@@ -628,14 +628,14 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
       return;
     }
 
-    int newQueueSize = Integer.MAX_VALUE;
+    int newQueueSize = C.LENGTH_UNSET;
     for (int i = preferredQueueSize; i < currentQueueSize; i++) {
       if (!haveReadFromMediaChunk(i)) {
         newQueueSize = i;
         break;
       }
     }
-    if (newQueueSize >= currentQueueSize) {
+    if (newQueueSize == C.LENGTH_UNSET) {
       return;
     }
 
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
index efedad7a96..79f4d975fc 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsSampleStreamWrapper.java
@@ -881,15 +881,14 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
   private void discardUpstream(int preferredQueueSize) {
     Assertions.checkState(!loader.isLoading());
 
-    int currentQueueSize = mediaChunks.size();
-    int newQueueSize = Integer.MAX_VALUE;
-    for (int i = preferredQueueSize; i < currentQueueSize; i++) {
+    int newQueueSize = C.LENGTH_UNSET;
+    for (int i = preferredQueueSize; i < mediaChunks.size(); i++) {
       if (!haveReadFromMediaChunkDiscardRange(i)) {
         newQueueSize = i;
         break;
       }
     }
-    if (newQueueSize >= currentQueueSize) {
+    if (newQueueSize == C.LENGTH_UNSET) {
       return;
     }