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

AudioSink: Correct access unit count logic

Browse Source 
Previously, the input buffer accessUnit count
was passed as the output of the audio processors
which did not make sense as the processors can
split buffers.

This patch passes the access unit count through a
member variable.

PiperOrigin-RevId: 295572577
This commit is contained in:
krocard 2020-02-17 14:02:25 +00:00 committed by Ian Baker
parent e6ebd8d70a
commit 27bd1294ec
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
View File

@ -258,8 +258,8 @@ public final class DefaultAudioSink implements AudioSink {
private AudioProcessor[] activeAudioProcessors; private AudioProcessor[] activeAudioProcessors;
private ByteBuffer[] outputBuffers; private ByteBuffer[] outputBuffers;
@Nullable private ByteBuffer inputBuffer; @Nullable private ByteBuffer inputBuffer;
private int inputBufferAccessUnitCount;
@Nullable private ByteBuffer outputBuffer; @Nullable private ByteBuffer outputBuffer;
private int outputBufferEncodedAccessUnitCount;
private byte[] preV21OutputBuffer; private byte[] preV21OutputBuffer;
private int preV21OutputBufferOffset; private int preV21OutputBufferOffset;
private int drainingAudioProcessorIndex; private int drainingAudioProcessorIndex;
@ -679,16 +679,14 @@ public final class DefaultAudioSink implements AudioSink {
} }
inputBuffer = buffer; inputBuffer = buffer;
inputBufferAccessUnitCount = encodedAccessUnitCount;
} }
if (configuration.processingEnabled) { processBuffers(presentationTimeUs);
processBuffers(presentationTimeUs, encodedAccessUnitCount);
} else {
writeBuffer(inputBuffer, presentationTimeUs, encodedAccessUnitCount);
}
if (!inputBuffer.hasRemaining()) { if (!inputBuffer.hasRemaining()) {
inputBuffer = null; inputBuffer = null;
inputBufferAccessUnitCount = 0;
return true; return true;
} }
@ -701,15 +699,14 @@ public final class DefaultAudioSink implements AudioSink {
return false; return false;
} }
private void processBuffers(long avSyncPresentationTimeUs, int encodedAccessUnitCount) private void processBuffers(long avSyncPresentationTimeUs) throws WriteException {
throws WriteException {
int count = activeAudioProcessors.length; int count = activeAudioProcessors.length;
int index = count; int index = count;
while (index >= 0) { while (index >= 0) {
ByteBuffer input = index > 0 ? outputBuffers[index - 1] ByteBuffer input = index > 0 ? outputBuffers[index - 1]
: (inputBuffer != null ? inputBuffer : AudioProcessor.EMPTY_BUFFER); : (inputBuffer != null ? inputBuffer : AudioProcessor.EMPTY_BUFFER);
if (index == count) { if (index == count) {
writeBuffer(input, avSyncPresentationTimeUs, encodedAccessUnitCount); writeBuffer(input, avSyncPresentationTimeUs);
} else { } else {
AudioProcessor audioProcessor = activeAudioProcessors[index]; AudioProcessor audioProcessor = activeAudioProcessors[index];
audioProcessor.queueInput(input); audioProcessor.queueInput(input);
@ -733,9 +730,7 @@ public final class DefaultAudioSink implements AudioSink {
} }
@SuppressWarnings("ReferenceEquality") @SuppressWarnings("ReferenceEquality")
private void writeBuffer( private void writeBuffer(ByteBuffer buffer, long avSyncPresentationTimeUs) throws WriteException {
ByteBuffer buffer, long avSyncPresentationTimeUs, int encodedAccessUnitCount)
throws WriteException {
if (!buffer.hasRemaining()) { if (!buffer.hasRemaining()) {
return; return;
} }
@ -743,7 +738,6 @@ public final class DefaultAudioSink implements AudioSink {
Assertions.checkArgument(outputBuffer == buffer); Assertions.checkArgument(outputBuffer == buffer);
} else { } else {
outputBuffer = buffer; outputBuffer = buffer;
outputBufferEncodedAccessUnitCount = encodedAccessUnitCount;
if (Util.SDK_INT < 21) { if (Util.SDK_INT < 21) {
int bytesRemaining = buffer.remaining(); int bytesRemaining = buffer.remaining();
if (preV21OutputBuffer == null || preV21OutputBuffer.length < bytesRemaining) { if (preV21OutputBuffer == null || preV21OutputBuffer.length < bytesRemaining) {
@ -787,10 +781,12 @@ public final class DefaultAudioSink implements AudioSink {
} }
if (bytesWritten == bytesRemaining) { if (bytesWritten == bytesRemaining) {
if (!configuration.isInputPcm) { if (!configuration.isInputPcm) {
writtenEncodedFrames += framesPerEncodedSample * encodedAccessUnitCount; // When playing non-PCM, the inputBuffer is never processed, thus the last inputBuffer
// must be the current input buffer.
Assertions.checkState(buffer == inputBuffer);
writtenEncodedFrames += framesPerEncodedSample * inputBufferAccessUnitCount;
} }
outputBuffer = null; outputBuffer = null;
outputBufferEncodedAccessUnitCount = 0;
} }
} }
@ -814,8 +810,7 @@ public final class DefaultAudioSink implements AudioSink {
if (audioProcessorNeedsEndOfStream) { if (audioProcessorNeedsEndOfStream) {
audioProcessor.queueEndOfStream(); audioProcessor.queueEndOfStream();
} }
// Audio is always PCM in audio processors, thus there is no encoded access unit count. processBuffers(C.TIME_UNSET);
processBuffers(C.TIME_UNSET, /* encodedAccessUnitCount= */ 0);
if (!audioProcessor.isEnded()) { if (!audioProcessor.isEnded()) {
return false; return false;
} }
@ -825,7 +820,7 @@ public final class DefaultAudioSink implements AudioSink {
// Finish writing any remaining output to the track. // Finish writing any remaining output to the track.
if (outputBuffer != null) { if (outputBuffer != null) {
writeBuffer(outputBuffer, C.TIME_UNSET, outputBufferEncodedAccessUnitCount); writeBuffer(outputBuffer, C.TIME_UNSET);
if (outputBuffer != null) { if (outputBuffer != null) {
return false; return false;
} }
@ -977,8 +972,8 @@ public final class DefaultAudioSink implements AudioSink {
trimmingAudioProcessor.resetTrimmedFrameCount(); trimmingAudioProcessor.resetTrimmedFrameCount();
flushAudioProcessors(); flushAudioProcessors();
inputBuffer = null; inputBuffer = null;
inputBufferAccessUnitCount = 0;
outputBuffer = null; outputBuffer = null;
outputBufferEncodedAccessUnitCount = 0;
stoppedAudioTrack = false; stoppedAudioTrack = false;
handledEndOfStream = false; handledEndOfStream = false;
drainingAudioProcessorIndex = C.INDEX_UNSET; drainingAudioProcessorIndex = C.INDEX_UNSET;