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

services/audioflinger/AudioFlinger.cpp

diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index a89088a..e325dfa 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -2896,8 +2896,8 @@
         audio_is_linear_pcm(config->format) &&
         audio_is_linear_pcm(halconfig.format) &&
         (halconfig.sample_rate <= AUDIO_RESAMPLER_DOWN_RATIO_MAX * config->sample_rate) &&
-        (audio_channel_count_from_in_mask(halconfig.channel_mask) <= FCC_8) &&
-        (audio_channel_count_from_in_mask(config->channel_mask) <= FCC_8)) {
+        (audio_channel_count_from_in_mask(halconfig.channel_mask) <= FCC_LIMIT) &&
+        (audio_channel_count_from_in_mask(config->channel_mask) <= FCC_LIMIT)) {
         // FIXME describe the change proposed by HAL (save old values so we can log them here)
         ALOGV("openInput_l() reopening with proposed sampling rate and channel mask");
         inStream.clear();