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

Remove duplicate DECODE_ONLY check

Browse source 
PiperOrigin-RevId: 316119460
This commit is contained in:
olly 2020-06-12 17:37:57 +01:00 committed by Oliver Woodman
parent f1b94f6f90
commit 0a617146b0
1 changed files with 9 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java
View file

@ -81,8 +81,7 @@ import java.util.PriorityQueue;
Assertions.checkArgument(inputBuffer == dequeuedInputBuffer); Assertions.checkArgument(inputBuffer == dequeuedInputBuffer);
CeaInputBuffer ceaInputBuffer = (CeaInputBuffer) inputBuffer; CeaInputBuffer ceaInputBuffer = (CeaInputBuffer) inputBuffer;
if (ceaInputBuffer.isDecodeOnly()) { if (ceaInputBuffer.isDecodeOnly()) {
// We can drop this buffer early (i.e. before it would be decoded) as the CEA formats allow // We can start decoding anywhere in CEA formats, so discarding on the input side is fine.
// for decoding to begin mid-stream.
releaseInputBuffer(ceaInputBuffer); releaseInputBuffer(ceaInputBuffer);
} else { } else {
ceaInputBuffer.queuedInputBufferCount = queuedInputBufferCount++; ceaInputBuffer.queuedInputBufferCount = queuedInputBufferCount++;
@ -97,15 +96,12 @@ import java.util.PriorityQueue;
if (availableOutputBuffers.isEmpty()) { if (availableOutputBuffers.isEmpty()) {
return null; return null;
} }
// iterate through all available input buffers whose timestamps are less than or equal // Process input buffers up to the current playback position. Processing of input buffers for
// to the current playback position; processing input buffers for future content should // future content is deferred.
// be deferred until they would be applicable
while (!queuedInputBuffers.isEmpty() while (!queuedInputBuffers.isEmpty()
&& Util.castNonNull(queuedInputBuffers.peek()).timeUs <= playbackPositionUs) { && Util.castNonNull(queuedInputBuffers.peek()).timeUs <= playbackPositionUs) {
CeaInputBuffer inputBuffer = Util.castNonNull(queuedInputBuffers.poll()); CeaInputBuffer inputBuffer = Util.castNonNull(queuedInputBuffers.poll());
// If the input buffer indicates we've reached the end of the stream, we can
// return immediately with an output buffer propagating that
if (inputBuffer.isEndOfStream()) { if (inputBuffer.isEndOfStream()) {
// availableOutputBuffers.isEmpty() is checked at the top of the method, so this is safe. // availableOutputBuffers.isEmpty() is checked at the top of the method, so this is safe.
SubtitleOutputBuffer outputBuffer = Util.castNonNull(availableOutputBuffers.pollFirst()); SubtitleOutputBuffer outputBuffer = Util.castNonNull(availableOutputBuffers.pollFirst());
@ -116,18 +112,13 @@ import java.util.PriorityQueue;
decode(inputBuffer); decode(inputBuffer);
// check if we have any caption updates to report
if (isNewSubtitleDataAvailable()) { if (isNewSubtitleDataAvailable()) {
// Even if the subtitle is decode-only; we need to generate it to consume the data so it
// isn't accidentally prepended to the next subtitle
Subtitle subtitle = createSubtitle(); Subtitle subtitle = createSubtitle();
if (!inputBuffer.isDecodeOnly()) { // availableOutputBuffers.isEmpty() is checked at the top of the method, so this is safe.
// availableOutputBuffers.isEmpty() is checked at the top of the method, so this is safe. SubtitleOutputBuffer outputBuffer = Util.castNonNull(availableOutputBuffers.pollFirst());
SubtitleOutputBuffer outputBuffer = Util.castNonNull(availableOutputBuffers.pollFirst()); outputBuffer.setContent(inputBuffer.timeUs, subtitle, Format.OFFSET_SAMPLE_RELATIVE);
outputBuffer.setContent(inputBuffer.timeUs, subtitle, Format.OFFSET_SAMPLE_RELATIVE); releaseInputBuffer(inputBuffer);
releaseInputBuffer(inputBuffer); return outputBuffer;
return outputBuffer;
}
} }
releaseInputBuffer(inputBuffer); releaseInputBuffer(inputBuffer);
@ -160,7 +151,7 @@ import java.util.PriorityQueue;
@Override @Override
public void release() { public void release() {
// Do nothing // Do nothing.
} }
/** /**