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

Partially merge InputBuffer and SampleHolder.

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=117908518
This commit is contained in:
andrewlewis 2016-03-23 01:36:39 -07:00 committed by Oliver Woodman
parent 0d1ae1dd67
commit 1175f50fb8
21 changed files with 166 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
library/src/main/java/com/google/android/exoplayer/FrameworkSampleSource.java
View file

@ -194,7 +194,6 @@ public final class FrameworkSampleSource implements SampleSource {
return TrackStream.FORMAT_READ;
}
int extractorTrackIndex = extractor.getSampleTrackIndex();
sampleHolder.flags = 0;
if (extractorTrackIndex == track) {
if (sampleHolder.data != null) {
int offset = sampleHolder.data.position();
@ -206,17 +205,17 @@ public final class FrameworkSampleSource implements SampleSource {
sampleHolder.timeUs = extractor.getSampleTime();
int flags = extractor.getSampleFlags();
if ((flags & MediaExtractor.SAMPLE_FLAG_SYNC) != 0) {
sampleHolder.flags |= C.SAMPLE_FLAG_SYNC;
sampleHolder.addFlag(C.SAMPLE_FLAG_SYNC);
}
if ((flags & MediaExtractor.SAMPLE_FLAG_ENCRYPTED) != 0) {
sampleHolder.flags |= C.SAMPLE_FLAG_ENCRYPTED;
sampleHolder.addFlag(C.SAMPLE_FLAG_ENCRYPTED);
sampleHolder.cryptoInfo.setFromExtractorV16(extractor);
}
pendingSeekPositionUs = C.UNKNOWN_TIME_US;
extractor.advance();
return TrackStream.SAMPLE_READ;
} else if (extractorTrackIndex < 0) {
sampleHolder.flags |= C.SAMPLE_FLAG_END_OF_STREAM;
sampleHolder.addFlag(C.SAMPLE_FLAG_END_OF_STREAM);
return TrackStream.END_OF_STREAM;
} else {
return TrackStream.NOTHING_READ;

6
library/src/main/java/com/google/android/exoplayer/MediaCodecTrackRenderer.java
View file

@ -555,7 +555,7 @@ public abstract class MediaCodecTrackRenderer extends SampleSourceTrackRenderer
return false;
}
sampleHolder.data = inputBuffers[inputIndex];
sampleHolder.clearData();
sampleHolder.clear();
}
if (codecReinitializationState == REINITIALIZATION_STATE_SIGNAL_END_OF_STREAM) {
@ -599,7 +599,7 @@ public abstract class MediaCodecTrackRenderer extends SampleSourceTrackRenderer
if (codecReconfigurationState == RECONFIGURATION_STATE_QUEUE_PENDING) {
// We received two formats in a row. Clear the current buffer of any reconfiguration data
// associated with the first format.
sampleHolder.clearData();
sampleHolder.clear();
codecReconfigurationState = RECONFIGURATION_STATE_WRITE_PENDING;
}
onInputFormatChanged(formatHolder);
@ -610,7 +610,7 @@ public abstract class MediaCodecTrackRenderer extends SampleSourceTrackRenderer
// We received a new format immediately before the end of the stream. We need to clear
// the corresponding reconfiguration data from the current buffer, but re-write it into
// a subsequent buffer if there are any (e.g. if the user seeks backwards).
sampleHolder.clearData();
sampleHolder.clear();
codecReconfigurationState = RECONFIGURATION_STATE_WRITE_PENDING;
}
inputStreamEnded = true;

41
library/src/main/java/com/google/android/exoplayer/SampleHolder.java
View file

@ -15,12 +15,14 @@
*/
package com.google.android.exoplayer;
import com.google.android.exoplayer.util.Buffer;
import java.nio.ByteBuffer;
/**
* Holds sample data and corresponding metadata.
*/
public final class SampleHolder {
public class SampleHolder extends Buffer {
/**
* Disallows buffer replacement.
@ -37,10 +39,13 @@ public final class SampleHolder {
*/
public static final int BUFFER_REPLACEMENT_MODE_DIRECT = 2;
/**
* {@link CryptoInfo} for encrypted samples.
*/
public final CryptoInfo cryptoInfo;
/**
* A buffer holding the sample data.
* A buffer holding the sample data, or {@code null} if no sample data has been set.
*/
public ByteBuffer data;
@ -49,11 +54,6 @@ public final class SampleHolder {
*/
public int size;
/**
* Flags that accompany the sample. A combination of the {@code C.SAMPLE_FLAG_*} constants.
*/
public int flags;
/**
* The time at which the sample should be presented.
*/
@ -108,30 +108,15 @@ public final class SampleHolder {
}
/**
* Returns whether {@link #flags} has {@link C#SAMPLE_FLAG_ENCRYPTED} set.
* Returns whether the sample has the {@link C#SAMPLE_FLAG_ENCRYPTED} flag set.
*/
public boolean isEncrypted() {
return (flags & C.SAMPLE_FLAG_ENCRYPTED) != 0;
public final boolean isEncrypted() {
return getFlag(C.SAMPLE_FLAG_ENCRYPTED);
}
/**
* Returns whether {@link #flags} has {@link C#SAMPLE_FLAG_DECODE_ONLY} set.
*/
public boolean isDecodeOnly() {
return (flags & C.SAMPLE_FLAG_DECODE_ONLY) != 0;
}
/**
* Returns whether {@link #flags} has {@link C#SAMPLE_FLAG_SYNC} set.
*/
public boolean isSyncFrame() {
return (flags & C.SAMPLE_FLAG_SYNC) != 0;
}
/**
* Clears {@link #data}. Does nothing if {@link #data} is null.
*/
public void clearData() {
@Override
public void clear() {
super.clear();
if (data != null) {
data.clear();
}

4
library/src/main/java/com/google/android/exoplayer/SingleSampleSource.java
View file

@ -162,7 +162,7 @@ public final class SingleSampleSource implements SampleSource, TrackStream, Load
@Override
public int readData(FormatHolder formatHolder, SampleHolder sampleHolder) {
if (state == STATE_END_OF_STREAM) {
sampleHolder.flags = C.SAMPLE_FLAG_END_OF_STREAM;
sampleHolder.addFlag(C.SAMPLE_FLAG_END_OF_STREAM);
return END_OF_STREAM;
} else if (state == STATE_SEND_FORMAT) {
formatHolder.format = format;
@ -176,7 +176,7 @@ public final class SingleSampleSource implements SampleSource, TrackStream, Load
} else {
sampleHolder.timeUs = 0;
sampleHolder.size = sampleSize;
sampleHolder.flags = C.SAMPLE_FLAG_SYNC;
sampleHolder.addFlag(C.SAMPLE_FLAG_SYNC);
sampleHolder.ensureSpaceForWrite(sampleHolder.size);
sampleHolder.data.put(sampleData, 0, sampleSize);
state = STATE_END_OF_STREAM;

7
library/src/main/java/com/google/android/exoplayer/chunk/ChunkSampleSource.java
View file

@ -273,15 +273,16 @@ public class ChunkSampleSource implements SampleSource, TrackStream, Loader.Call
if (!haveSamples) {
if (loadingFinished) {
sampleHolder.flags = C.SAMPLE_FLAG_END_OF_STREAM;
sampleHolder.addFlag(C.SAMPLE_FLAG_END_OF_STREAM);
return END_OF_STREAM;
}
return NOTHING_READ;
}
if (sampleQueue.getSample(sampleHolder)) {
boolean decodeOnly = sampleHolder.timeUs < lastSeekPositionUs;
sampleHolder.flags |= decodeOnly ? C.SAMPLE_FLAG_DECODE_ONLY : 0;
if (sampleHolder.timeUs < lastSeekPositionUs) {
sampleHolder.addFlag(C.SAMPLE_FLAG_DECODE_ONLY);
}
onSampleRead(currentChunk, sampleHolder);
return SAMPLE_READ;
}

7
library/src/main/java/com/google/android/exoplayer/extractor/ExtractorSampleSource.java
View file

@ -448,8 +448,9 @@ public final class ExtractorSampleSource implements SampleSource, ExtractorOutpu
}
if (sampleQueue.getSample(sampleHolder)) {
boolean decodeOnly = sampleHolder.timeUs < lastSeekPositionUs;
sampleHolder.flags |= decodeOnly ? C.SAMPLE_FLAG_DECODE_ONLY : 0;
if (sampleHolder.timeUs < lastSeekPositionUs) {
sampleHolder.addFlag(C.SAMPLE_FLAG_DECODE_ONLY);
}
if (havePendingNextSampleUs) {
// Set the offset to make the timestamp of this sample equal to pendingNextSampleUs.
sampleTimeOffsetUs = pendingNextSampleUs - sampleHolder.timeUs;
@ -460,7 +461,7 @@ public final class ExtractorSampleSource implements SampleSource, ExtractorOutpu
}
if (loadingFinished) {
sampleHolder.flags = C.SAMPLE_FLAG_END_OF_STREAM;
sampleHolder.addFlag(C.SAMPLE_FLAG_END_OF_STREAM);
return TrackStream.END_OF_STREAM;
}

11
library/src/main/java/com/google/android/exoplayer/extractor/RollingSampleBuffer.java
View file

@ -135,8 +135,7 @@ import java.util.concurrent.LinkedBlockingDeque;
/**
* Fills {@code holder} with information about the current sample, but does not write its data.
* <p>
* The fields set are {@link SampleHolder#size}, {@link SampleHolder#timeUs} and
* {@link SampleHolder#flags}.
* Populates {@link SampleHolder#size}, {@link SampleHolder#timeUs} and the sample flags.
*
* @param holder The holder into which the current sample information should be written.
* @return True if the holder was filled. False if there is no current sample.
@ -419,7 +418,7 @@ import java.util.concurrent.LinkedBlockingDeque;
* Indicates the end point for the current sample, making it available for consumption.
*
* @param sampleTimeUs The sample timestamp.
* @param flags Flags that accompany the sample. See {@link SampleHolder#flags}.
* @param flags Flags that accompany the sample. See {@code C.SAMPLE_FLAG_*}.
* @param position The position of the sample data in the rolling buffer.
* @param size The size of the sample, in bytes.
* @param encryptionKey The encryption key associated with the sample, or null.
@ -528,8 +527,8 @@ import java.util.concurrent.LinkedBlockingDeque;
* The first entry in {@code offsetHolder} is filled with the absolute position of the sample's
* data in the rolling buffer.
* <p>
* The fields set are {SampleHolder#size}, {SampleHolder#timeUs}, {SampleHolder#flags} and
* {@code offsetHolder[0]}.
* Populates {@link SampleHolder#size}, {@link SampleHolder#timeUs}, the sample flags and
* {@code extrasHolder}.
*
* @param holder The holder into which the current sample information should be written.
* @param extrasHolder The holder into which extra sample information should be written.
@ -541,7 +540,7 @@ import java.util.concurrent.LinkedBlockingDeque;
}
holder.timeUs = timesUs[relativeReadIndex];
holder.size = sizes[relativeReadIndex];
holder.flags = flags[relativeReadIndex];
holder.setFlags(flags[relativeReadIndex]);
extrasHolder.offset = offsets[relativeReadIndex];
extrasHolder.encryptionKeyId = encryptionKeys[relativeReadIndex];
return true;

3
library/src/main/java/com/google/android/exoplayer/extractor/TrackOutput.java
View file

@ -17,7 +17,6 @@ package com.google.android.exoplayer.extractor;
import com.google.android.exoplayer.C;
import com.google.android.exoplayer.Format;
import com.google.android.exoplayer.SampleHolder;
import com.google.android.exoplayer.util.ParsableByteArray;
import java.io.EOFException;
@ -66,7 +65,7 @@ public interface TrackOutput {
* {@link #sampleData(ParsableByteArray, int)}.
*
* @param timeUs The media timestamp associated with the sample, in microseconds.
* @param flags Flags associated with the sample. See {@link SampleHolder#flags}.
* @param flags Flags associated with the sample. See {@code C.SAMPLE_FLAG_*}.
* @param size The size of the sample data, in bytes.
* @param offset The number of bytes that have been passed to
* {@link #sampleData(ExtractorInput, int, boolean)} or

7
library/src/main/java/com/google/android/exoplayer/hls/HlsSampleSource.java
View file

@ -331,13 +331,14 @@ public final class HlsSampleSource implements SampleSource, Loader.Callback {
}
if (extractor.getSample(group, sampleHolder)) {
boolean decodeOnly = sampleHolder.timeUs < lastSeekPositionUs;
sampleHolder.flags |= decodeOnly ? C.SAMPLE_FLAG_DECODE_ONLY : 0;
if (sampleHolder.timeUs < lastSeekPositionUs) {
sampleHolder.addFlag(C.SAMPLE_FLAG_DECODE_ONLY);
}
return TrackStream.SAMPLE_READ;
}
if (loadingFinished) {
sampleHolder.flags = C.SAMPLE_FLAG_END_OF_STREAM;
sampleHolder.addFlag(C.SAMPLE_FLAG_END_OF_STREAM);
return TrackStream.END_OF_STREAM;
}

2
library/src/main/java/com/google/android/exoplayer/metadata/MetadataTrackRenderer.java
View file

@ -101,7 +101,7 @@ public final class MetadataTrackRenderer<T> extends SampleSourceTrackRenderer im
protected void render(long positionUs, long elapsedRealtimeUs, boolean sourceIsReady)
throws ExoPlaybackException {
if (!inputStreamEnded && pendingMetadata == null) {
sampleHolder.clearData();
sampleHolder.clear();
int result = readSource(formatHolder, sampleHolder);
if (result == TrackStream.SAMPLE_READ) {
pendingMetadataTimestamp = sampleHolder.timeUs;

3
library/src/main/java/com/google/android/exoplayer/text/SubtitleInputBuffer.java
View file

@ -16,12 +16,11 @@
package com.google.android.exoplayer.text;
import com.google.android.exoplayer.SampleHolder;
import com.google.android.exoplayer.util.extensions.InputBuffer;
/**
* An input buffer for {@link SubtitleParser}.
*/
/* package */ final class SubtitleInputBuffer extends InputBuffer {
/* package */ final class SubtitleInputBuffer extends SampleHolder {
public long subsampleOffsetUs;

6
library/src/main/java/com/google/android/exoplayer/text/SubtitleOutputBuffer.java
View file

@ -71,4 +71,10 @@ import java.util.List;
owner.releaseOutputBuffer(this);
}
@Override
public void clear() {
super.clear();
subtitle = null;
}
}

6
library/src/main/java/com/google/android/exoplayer/text/SubtitleParser.java
View file

@ -48,10 +48,8 @@ public abstract class SubtitleParser extends
protected final ParserException decode(SubtitleInputBuffer inputBuffer,
SubtitleOutputBuffer outputBuffer) {
try {
Subtitle subtitle = decode(inputBuffer.sampleHolder.data.array(),
inputBuffer.sampleHolder.size);
outputBuffer.setOutput(inputBuffer.sampleHolder.timeUs, subtitle,
inputBuffer.subsampleOffsetUs);
Subtitle subtitle = decode(inputBuffer.data.array(), inputBuffer.size);
outputBuffer.setOutput(inputBuffer.timeUs, subtitle, inputBuffer.subsampleOffsetUs);
return null;
} catch (ParserException e) {
return e;

5
library/src/main/java/com/google/android/exoplayer/text/TextTrackRenderer.java
View file

@ -19,7 +19,6 @@ import com.google.android.exoplayer.ExoPlaybackException;
import com.google.android.exoplayer.Format;
import com.google.android.exoplayer.FormatHolder;
import com.google.android.exoplayer.ParserException;
import com.google.android.exoplayer.SampleHolder;
import com.google.android.exoplayer.SampleSourceTrackRenderer;
import com.google.android.exoplayer.TrackRenderer;
import com.google.android.exoplayer.TrackStream;
@ -176,9 +175,7 @@ public final class TextTrackRenderer extends SampleSourceTrackRenderer implement
}
}
// Try and read the next subtitle from the source.
SampleHolder sampleHolder = nextInputBuffer.sampleHolder;
sampleHolder.clearData();
int result = readSource(formatHolder, sampleHolder);
int result = readSource(formatHolder, nextInputBuffer);
if (result == TrackStream.SAMPLE_READ) {
nextInputBuffer.subsampleOffsetUs = formatHolder.format.subsampleOffsetUs;
parser.queueInputBuffer(nextInputBuffer);

2
library/src/main/java/com/google/android/exoplayer/text/eia608/Eia608TrackRenderer.java
View file

@ -339,8 +339,8 @@ public final class Eia608TrackRenderer extends SampleSourceTrackRenderer impleme
}
private void clearPendingSample() {
sampleHolder.clear();
sampleHolder.timeUs = C.UNKNOWN_TIME_US;
sampleHolder.clearData();
}
private boolean isSamplePending() {

85
library/src/main/java/com/google/android/exoplayer/util/Buffer.java Normal file
View file

@ -0,0 +1,85 @@
/*
* Copyright (C) 2014 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.google.android.exoplayer.util;
import com.google.android.exoplayer.C;
/**
* Base class for buffers with flags.
*/
public abstract class Buffer {
private int flags;
/**
* Clears the buffer.
*/
public void clear() {
flags = 0;
}
/**
* Returns whether the {@link C#SAMPLE_FLAG_DECODE_ONLY} flag is set.
*/
public final boolean isDecodeOnly() {
return getFlag(C.SAMPLE_FLAG_DECODE_ONLY);
}
/**
* Returns whether the {@link C#SAMPLE_FLAG_END_OF_STREAM} flag is set.
*/
public final boolean isEndOfStream() {
return getFlag(C.SAMPLE_FLAG_END_OF_STREAM);
}
/**
* Returns whether the sample has the {@link C#SAMPLE_FLAG_SYNC} flag set.
*/
public final boolean isSyncFrame() {
return getFlag(C.SAMPLE_FLAG_SYNC);
}
/**
* Replaces this buffer's flags with {@code flags}.
*
* @param flags The flags to set, which should be a combination of the {@code C.SAMPLE_FLAG_*}
* constants.
*/
public final void setFlags(int flags) {
this.flags = flags;
}
/**
* Adds the {@code flag} to this buffer's flags.
*
* @param flag The flag to add to this buffer's flags, which should be one of the
* {@code C.SAMPLE_FLAG_*} constants.
*/
public final void addFlag(int flag) {
flags |= flag;
}
/**
* Returns whether the specified flag has been set on this buffer.
*
* @param flag The flag to check.
* @return Whether the flag is set.
*/
protected final boolean getFlag(int flag) {
return (flags & flag) == flag;
}
}

37
library/src/main/java/com/google/android/exoplayer/util/extensions/Buffer.java
View file

@ -1,37 +0,0 @@
/*
* Copyright (C) 2014 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.google.android.exoplayer.util.extensions;
/**
* Base class for {@link Decoder} buffers with flags.
*/
public abstract class Buffer {
private int flags;
public void reset() {
flags = 0;
}
public final void setFlag(int flag) {
flags |= flag;
}
public final boolean getFlag(int flag) {
return (flags & flag) == flag;
}
}

2
library/src/main/java/com/google/android/exoplayer/util/extensions/Decoder.java
View file

@ -27,7 +27,7 @@ public interface Decoder<I, O, E extends Exception> {
/**
* Dequeues the next input buffer to be filled and queued to the decoder.
*
* @return The input buffer, or null if an input buffer isn't available.
* @return The input buffer, which will have been cleared, or null if a buffer isn't available.
* @throws E If a decoder error has occurred.
*/
I dequeueInputBuffer() throws E;

41
library/src/main/java/com/google/android/exoplayer/util/extensions/InputBuffer.java
View file

@ -1,41 +0,0 @@
/*
* Copyright (C) 2014 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.google.android.exoplayer.util.extensions;
import com.google.android.exoplayer.SampleHolder;
/**
* Input buffer to be decoded by a {@link Decoder}.
*/
public class InputBuffer extends Buffer {
public final SampleHolder sampleHolder;
public InputBuffer() {
this(SampleHolder.BUFFER_REPLACEMENT_MODE_DIRECT);
}
public InputBuffer(int bufferReplacementMode) {
sampleHolder = new SampleHolder(bufferReplacementMode);
}
@Override
public void reset() {
super.reset();
sampleHolder.clearData();
}
}

2
library/src/main/java/com/google/android/exoplayer/util/extensions/OutputBuffer.java
View file

@ -15,6 +15,8 @@
*/
package com.google.android.exoplayer.util.extensions;
import com.google.android.exoplayer.util.Buffer;
/**
* Output buffer decoded by a {@link Decoder}.
*/

48
library/src/main/java/com/google/android/exoplayer/util/extensions/SimpleDecoder.java
View file

@ -16,6 +16,7 @@
package com.google.android.exoplayer.util.extensions;
import com.google.android.exoplayer.C;
import com.google.android.exoplayer.SampleHolder;
import com.google.android.exoplayer.util.Assertions;
import java.util.LinkedList;
@ -23,7 +24,7 @@ import java.util.LinkedList;
/**
* Base class for {@link Decoder}s that use their own decode thread.
*/
public abstract class SimpleDecoder<I extends InputBuffer, O extends OutputBuffer,
public abstract class SimpleDecoder<I extends SampleHolder, O extends OutputBuffer,
E extends Exception> extends Thread implements Decoder<I, O, E> {
/**
@ -85,7 +86,7 @@ public abstract class SimpleDecoder<I extends InputBuffer, O extends OutputBuffe
protected final void setInitialInputBufferSize(int size) {
Assertions.checkState(availableInputBufferCount == availableInputBuffers.length);
for (I inputBuffer : availableInputBuffers) {
inputBuffer.sampleHolder.ensureSpaceForWrite(size);
inputBuffer.ensureSpaceForWrite(size);
}
}
@ -94,13 +95,9 @@ public abstract class SimpleDecoder<I extends InputBuffer, O extends OutputBuffe
synchronized (lock) {
maybeThrowException();
Assertions.checkState(dequeuedInputBuffer == null);
if (availableInputBufferCount == 0) {
return null;
}
I inputBuffer = availableInputBuffers[--availableInputBufferCount];
inputBuffer.reset();
dequeuedInputBuffer = inputBuffer;
return inputBuffer;
dequeuedInputBuffer = availableInputBufferCount == 0 ? null
: availableInputBuffers[--availableInputBufferCount];
return dequeuedInputBuffer;
}
}
@ -133,7 +130,7 @@ public abstract class SimpleDecoder<I extends InputBuffer, O extends OutputBuffe
*/
protected void releaseOutputBuffer(O outputBuffer) {
synchronized (lock) {
availableOutputBuffers[availableOutputBufferCount++] = outputBuffer;
releaseOutputBufferInternal(outputBuffer);
maybeNotifyDecodeLoop();
}
}
@ -143,14 +140,14 @@ public abstract class SimpleDecoder<I extends InputBuffer, O extends OutputBuffe
synchronized (lock) {
flushDecodedOutputBuffer = true;
if (dequeuedInputBuffer != null) {
availableInputBuffers[availableInputBufferCount++] = dequeuedInputBuffer;
releaseInputBufferInternal(dequeuedInputBuffer);
dequeuedInputBuffer = null;
}
while (!queuedInputBuffers.isEmpty()) {
availableInputBuffers[availableInputBufferCount++] = queuedInputBuffers.removeFirst();
releaseInputBufferInternal(queuedInputBuffers.removeFirst());
}
while (!queuedOutputBuffers.isEmpty()) {
availableOutputBuffers[availableOutputBufferCount++] = queuedOutputBuffers.removeFirst();
releaseOutputBufferInternal(queuedOutputBuffers.removeFirst());
}
}
}
@ -220,12 +217,11 @@ public abstract class SimpleDecoder<I extends InputBuffer, O extends OutputBuffe
flushDecodedOutputBuffer = false;
}
outputBuffer.reset();
if (inputBuffer.getFlag(C.SAMPLE_FLAG_END_OF_STREAM)) {
outputBuffer.setFlag(C.SAMPLE_FLAG_END_OF_STREAM);
if (inputBuffer.isEndOfStream()) {
outputBuffer.addFlag(C.SAMPLE_FLAG_END_OF_STREAM);
} else {
if (inputBuffer.getFlag(C.SAMPLE_FLAG_DECODE_ONLY)) {
outputBuffer.setFlag(C.SAMPLE_FLAG_DECODE_ONLY);
if (inputBuffer.isDecodeOnly()) {
outputBuffer.addFlag(C.SAMPLE_FLAG_DECODE_ONLY);
}
exception = decode(inputBuffer, outputBuffer);
if (exception != null) {
@ -236,16 +232,16 @@ public abstract class SimpleDecoder<I extends InputBuffer, O extends OutputBuffe
}
synchronized (lock) {
if (flushDecodedOutputBuffer || outputBuffer.getFlag(C.SAMPLE_FLAG_DECODE_ONLY)) {
if (flushDecodedOutputBuffer || outputBuffer.isDecodeOnly()) {
// If a flush occurred while decoding or the buffer was only for decoding (not presentation)
// then make the output buffer available again rather than queueing it to be consumed.
availableOutputBuffers[availableOutputBufferCount++] = outputBuffer;
releaseOutputBufferInternal(outputBuffer);
} else {
// Queue the decoded output buffer to be consumed.
queuedOutputBuffers.addLast(outputBuffer);
}
// Make the input buffer available again.
availableInputBuffers[availableInputBufferCount++] = inputBuffer;
releaseInputBufferInternal(inputBuffer);
}
return true;
@ -255,6 +251,16 @@ public abstract class SimpleDecoder<I extends InputBuffer, O extends OutputBuffe
return !queuedInputBuffers.isEmpty() && availableOutputBufferCount > 0;
}
private void releaseInputBufferInternal(I inputBuffer) {
inputBuffer.clear();
availableInputBuffers[availableInputBufferCount++] = inputBuffer;
}
private void releaseOutputBufferInternal(O outputBuffer) {
outputBuffer.clear();
availableOutputBuffers[availableOutputBufferCount++] = outputBuffer;
}
/**
* Creates a new input buffer.
*/