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

Prevent reading into preload parts.

Browse source 
This is to ensure we can still discard the data if needed.

Issue: #5011
PiperOrigin-RevId: 344977548
This commit is contained in:
tonihei 2020-12-01 10:02:49 +00:00 committed by Oliver Woodman
parent 84a7ffc12a
commit 8349d7849e
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -596,6 +596,11 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
downstreamTrackFormat = trackFormat; downstreamTrackFormat = trackFormat;
} }
if (!mediaChunks.isEmpty() && !mediaChunks.get(0).isPublished()) {
// Don't read into preload chunks until we can be sure they are permanently published.
return C.RESULT_NOTHING_READ;
}
int result = int result =
sampleQueues[sampleQueueIndex].read(formatHolder, buffer, requireFormat, loadingFinished); sampleQueues[sampleQueueIndex].read(formatHolder, buffer, requireFormat, loadingFinished);
if (result == C.RESULT_FORMAT_READ) { if (result == C.RESULT_FORMAT_READ) {
@ -625,6 +630,21 @@ import org.checkerframework.checker.nullness.qual.RequiresNonNull;
SampleQueue sampleQueue = sampleQueues[sampleQueueIndex]; SampleQueue sampleQueue = sampleQueues[sampleQueueIndex];
int skipCount = sampleQueue.getSkipCount(positionUs, loadingFinished); int skipCount = sampleQueue.getSkipCount(positionUs, loadingFinished);
// Ensure we don't skip into preload chunks until we can be sure they are permanently published.
int readIndex = sampleQueue.getReadIndex();
for (int i = 0; i < mediaChunks.size(); i++) {
HlsMediaChunk mediaChunk = mediaChunks.get(i);
int firstSampleIndex = mediaChunks.get(i).getFirstSampleIndex(sampleQueueIndex);
if (readIndex + skipCount <= firstSampleIndex) {
break;
}
if (!mediaChunk.isPublished()) {
skipCount = firstSampleIndex - readIndex;
break;
}
}
sampleQueue.skip(skipCount); sampleQueue.skip(skipCount);
return skipCount; return skipCount;
} }