From 33cf96cfdf1d10106d8affd534772a2c1c7b76c9 Mon Sep 17 00:00:00 2001 From: krocard Date: Fri, 10 Jul 2020 14:33:08 +0100 Subject: [PATCH] Fix more DecoderCounter increase in batching mode The counter was increased by one for each batch instead of each frame. Additionally fix a null check. PiperOrigin-RevId: 320592873 --- .../android/exoplayer2/audio/MediaCodecAudioRenderer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java index 6ef4a192fa..34a19652b8 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java +++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/MediaCodecAudioRenderer.java @@ -625,7 +625,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media if (codecPassthroughFormat != null && (bufferFlags & MediaCodec.BUFFER_FLAG_CODEC_CONFIG) != 0) { // Discard output buffers from the passthrough (raw) decoder containing codec specific data. - codec.releaseOutputBuffer(bufferIndex, false); + Assertions.checkNotNull(codec).releaseOutputBuffer(bufferIndex, false); return true; } @@ -650,7 +650,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media if (codec != null) { codec.releaseOutputBuffer(bufferIndex, false); } - decoderCounters.renderedOutputBufferCount++; + decoderCounters.renderedOutputBufferCount += sampleCount; return true; }