Commit 26d75baa by samrobinson Committed by Ian Baker

Add handling for null input buffer in DefaultAudioSink processBuffers.

#minor-release

PiperOrigin-RevId: 494166943
parent 92bd4c61
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
package com.google.android.exoplayer2.audio; package com.google.android.exoplayer2.audio;
import static com.google.android.exoplayer2.audio.AudioCapabilities.DEFAULT_AUDIO_CAPABILITIES; import static com.google.android.exoplayer2.audio.AudioCapabilities.DEFAULT_AUDIO_CAPABILITIES;
import static com.google.android.exoplayer2.audio.AudioProcessor.EMPTY_BUFFER;
import static com.google.android.exoplayer2.util.Assertions.checkNotNull; import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
import static com.google.android.exoplayer2.util.Util.constrainValue; import static com.google.android.exoplayer2.util.Util.constrainValue;
import static java.lang.Math.max; import static java.lang.Math.max;
...@@ -1002,8 +1003,8 @@ public final class DefaultAudioSink implements AudioSink { ...@@ -1002,8 +1003,8 @@ public final class DefaultAudioSink implements AudioSink {
* {@link #writeBuffer(ByteBuffer, long)}. * {@link #writeBuffer(ByteBuffer, long)}.
*/ */
private void processBuffers(long avSyncPresentationTimeUs) throws WriteException { private void processBuffers(long avSyncPresentationTimeUs) throws WriteException {
if (!audioProcessingPipeline.isOperational() && inputBuffer != null) { if (!audioProcessingPipeline.isOperational()) {
writeBuffer(inputBuffer, avSyncPresentationTimeUs); writeBuffer(inputBuffer != null ? inputBuffer : EMPTY_BUFFER, avSyncPresentationTimeUs);
return; return;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment