From be080f22ae678452042de89e712e484bc44ab517 Mon Sep 17 00:00:00 2001 From: samrobinson Date: Fri, 9 Dec 2022 15:28:13 +0000 Subject: [PATCH] Add handling for null input buffer in DefaultAudioSink processBuffers. #minor-release PiperOrigin-RevId: 494166943 --- .../androidx/media3/exoplayer/audio/DefaultAudioSink.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java index a93e410c68..d7bdb9f675 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/audio/DefaultAudioSink.java @@ -15,6 +15,7 @@ */ package androidx.media3.exoplayer.audio; +import static androidx.media3.common.audio.AudioProcessor.EMPTY_BUFFER; import static androidx.media3.common.util.Assertions.checkNotNull; import static androidx.media3.common.util.Util.constrainValue; import static androidx.media3.exoplayer.audio.AudioCapabilities.DEFAULT_AUDIO_CAPABILITIES; @@ -1013,8 +1014,8 @@ public final class DefaultAudioSink implements AudioSink { * {@link #writeBuffer(ByteBuffer, long)}. */ private void processBuffers(long avSyncPresentationTimeUs) throws WriteException { - if (!audioProcessingPipeline.isOperational() && inputBuffer != null) { - writeBuffer(inputBuffer, avSyncPresentationTimeUs); + if (!audioProcessingPipeline.isOperational()) { + writeBuffer(inputBuffer != null ? inputBuffer : EMPTY_BUFFER, avSyncPresentationTimeUs); return; }