commit 8514b930b1bcf49e957bb6b4a3252400e337dd69
author Andy Hung <hunga@google.com> Fri Apr 14 17:58:02 2023 -0700
committer Andy Hung <hunga@google.com> Mon Apr 17 16:40:52 2023 -0700
tree 3a085a976fa9f08bb60866ea5032ac6bb2c50672
parent ef9e5dd846de36dead09f928a22a3944bf3ecbc8

AudioMixer: Enable 5.1 based for fallback downmix

Test: oboetester
Test: atest downmix_tests
Bug: 230414312
Bug: 238397904
Change-Id: Ie093319c5fefc459165ae3d6c57b7836e8b625e5

media/libaudioprocessing/AudioMixer.cpp

diff --git a/media/libaudioprocessing/AudioMixer.cpp b/media/libaudioprocessing/AudioMixer.cpp
index 6a39108..57b860d 100644
--- a/media/libaudioprocessing/AudioMixer.cpp
+++ b/media/libaudioprocessing/AudioMixer.cpp
@@ -193,7 +193,7 @@
 
     // See if we should use our built-in non-effect downmixer.
     if (mMixerInFormat == AUDIO_FORMAT_PCM_FLOAT
-            && mMixerChannelMask == AUDIO_CHANNEL_OUT_STEREO
+            && ChannelMixBufferProvider::isOutputChannelMaskSupported(mMixerChannelMask)
             && audio_channel_mask_get_representation(channelMask)
                     == AUDIO_CHANNEL_REPRESENTATION_POSITION) {
         mDownmixerBufferProvider.reset(new ChannelMixBufferProvider(channelMask,