commit 936845ad4f13a099a565b9724335d30dabe3acde
author Andy Hung <hunga@google.com> Tue Jun 08 00:09:06 2021 -0700
committer Andy Hung <hunga@google.com> Tue Jun 08 15:09:37 2021 -0700
tree a630ee6bf2278074cdde530381a0f37128d07707
parent cee4d3db3b1dafc5a43fcc4c0b603858c24cfd72

Audio: Support FCC_LIMIT for 22.2 testing

Test: Basic audio checks
Bug: 189325443
Change-Id: Ie49f077e5deb7dcbc6acc32502d9ce82bcb85c04

media/libaudioprocessing/AudioMixerOps.h

diff --git a/media/libaudioprocessing/AudioMixerOps.h b/media/libaudioprocessing/AudioMixerOps.h
index 8d374c9..a56d9cb 100644
--- a/media/libaudioprocessing/AudioMixerOps.h
+++ b/media/libaudioprocessing/AudioMixerOps.h
@@ -17,6 +17,8 @@
 #ifndef ANDROID_AUDIO_MIXER_OPS_H
 #define ANDROID_AUDIO_MIXER_OPS_H
 
+#include <system/audio.h>
+
 namespace android {
 
 // Hack to make static_assert work in a constexpr
@@ -231,7 +233,7 @@
         typename TO, typename TI, typename TV,
         typename F>
 void stereoVolumeHelper(TO*& out, const TI*& in, const TV *vol, F f) {
-    static_assert(NCHAN > 0 && NCHAN <= 8);
+    static_assert(NCHAN > 0 && NCHAN <= FCC_LIMIT);
     static_assert(MIXTYPE == MIXTYPE_MULTI_STEREOVOL
             || MIXTYPE == MIXTYPE_MULTI_SAVEONLY_STEREOVOL
             || MIXTYPE == MIXTYPE_STEREOEXPAND