From 1730b6bb51c8e487b51a32a9e5936828de1cdadb Mon Sep 17 00:00:00 2001 From: andrewlewis Date: Tue, 19 Nov 2019 11:57:23 +0000 Subject: [PATCH] Reconfigure audio sink when PCM encoding changes Note: - Fixing this uncovers another bug in how audio processor draining works, so the test playlist still doesn't play correctly after this change. - Once we reconfigure the audio sink based on the ExoPlayer Format rather than the codec MediaFormat in a later change, this change can be reverted. Issue: #6601 PiperOrigin-RevId: 281264149 --- .../google/android/exoplayer2/audio/MediaCodecAudioRenderer.java | 1 + 1 file changed, 1 insertion(+) 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 873219d31d..a6a8b03448 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 @@ -512,6 +512,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media return Util.areEqual(oldFormat.sampleMimeType, newFormat.sampleMimeType) && oldFormat.channelCount == newFormat.channelCount && oldFormat.sampleRate == newFormat.sampleRate + && oldFormat.pcmEncoding == newFormat.pcmEncoding && oldFormat.initializationDataEquals(newFormat) && !MimeTypes.AUDIO_OPUS.equals(oldFormat.sampleMimeType); }