Commit 0add067e by tonihei Committed by Oliver Woodman

Make fallback value more explicitly unset.

PiperOrigin-RevId: 313171970
parent 03ea39b1
...@@ -628,14 +628,14 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S ...@@ -628,14 +628,14 @@ public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, S
return; return;
} }
int newQueueSize = Integer.MAX_VALUE; int newQueueSize = C.LENGTH_UNSET;
for (int i = preferredQueueSize; i < currentQueueSize; i++) { for (int i = preferredQueueSize; i < currentQueueSize; i++) {
if (!haveReadFromMediaChunk(i)) { if (!haveReadFromMediaChunk(i)) {
newQueueSize = i; newQueueSize = i;
break; break;
} }
} }
if (newQueueSize >= currentQueueSize) { if (newQueueSize == C.LENGTH_UNSET) {
return; return;
} }
......
...@@ -881,15 +881,14 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull; ...@@ -881,15 +881,14 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
private void discardUpstream(int preferredQueueSize) { private void discardUpstream(int preferredQueueSize) {
Assertions.checkState(!loader.isLoading()); Assertions.checkState(!loader.isLoading());
int currentQueueSize = mediaChunks.size(); int newQueueSize = C.LENGTH_UNSET;
int newQueueSize = Integer.MAX_VALUE; for (int i = preferredQueueSize; i < mediaChunks.size(); i++) {
for (int i = preferredQueueSize; i < currentQueueSize; i++) {
if (!haveReadFromMediaChunkDiscardRange(i)) { if (!haveReadFromMediaChunkDiscardRange(i)) {
newQueueSize = i; newQueueSize = i;
break; break;
} }
} }
if (newQueueSize >= currentQueueSize) { if (newQueueSize == C.LENGTH_UNSET) {
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment