loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-03 21:57:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move readPosition modification out of readSampleMetadata

Browse Source 
Preparation CL for SampleQueue.peek.

PiperOrigin-RevId: 351439887
This commit is contained in:
aquilescanta 2021-01-12 21:43:17 +00:00 committed by Oliver Woodman
parent 69423bc2b4
commit 03ebc5b52f
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
library/core/src/main/java/com/google/android/exoplayer2/source/SampleQueue.java
View File

@ -403,9 +403,10 @@ public class SampleQueue implements TrackOutput {
boolean formatRequired, boolean formatRequired,
boolean loadingFinished) { boolean loadingFinished) {
int result = int result =
readSampleMetadata(formatHolder, buffer, formatRequired, loadingFinished, extrasHolder); peekSampleMetadata(formatHolder, buffer, formatRequired, loadingFinished, extrasHolder);
if (result == C.RESULT_BUFFER_READ && !buffer.isEndOfStream() && !buffer.isFlagsOnly()) { if (result == C.RESULT_BUFFER_READ && !buffer.isEndOfStream() && !buffer.isFlagsOnly()) {
sampleDataQueue.readToBuffer(buffer, extrasHolder); sampleDataQueue.readToBuffer(buffer, extrasHolder);
readPosition++;
} }
return result; return result;
} }
@ -650,7 +651,7 @@ public class SampleQueue implements TrackOutput {
} }
@SuppressWarnings("ReferenceEquality") // See comments in setUpstreamFormat @SuppressWarnings("ReferenceEquality") // See comments in setUpstreamFormat
private synchronized int readSampleMetadata( private synchronized int peekSampleMetadata(
FormatHolder formatHolder, FormatHolder formatHolder,
DecoderInputBuffer buffer, DecoderInputBuffer buffer,
boolean formatRequired, boolean formatRequired,
@ -685,14 +686,10 @@ public class SampleQueue implements TrackOutput {
if (buffer.timeUs < startTimeUs) { if (buffer.timeUs < startTimeUs) {
buffer.addFlag(C.BUFFER_FLAG_DECODE_ONLY); buffer.addFlag(C.BUFFER_FLAG_DECODE_ONLY);
} }
if (buffer.isFlagsOnly()) {
return C.RESULT_BUFFER_READ;
}
extrasHolder.size = sizes[relativeReadIndex]; extrasHolder.size = sizes[relativeReadIndex];
extrasHolder.offset = offsets[relativeReadIndex]; extrasHolder.offset = offsets[relativeReadIndex];
extrasHolder.cryptoData = cryptoDatas[relativeReadIndex]; extrasHolder.cryptoData = cryptoDatas[relativeReadIndex];
readPosition++;
return C.RESULT_BUFFER_READ; return C.RESULT_BUFFER_READ;
} }