sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make fallback value more explicitly unset.

Browse source 
PiperOrigin-RevId: 313171970
This commit is contained in:
tonihei 2020-05-26 13:17:38 +01:00 committed by Oliver Woodman
parent 03ea39b175
commit 0add067eaa
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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;
} }

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

@ -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;
} }