Merge "audioflinger: extend max i/p channel to 8 channels" into nyc-dev
am: a605dafc27
* commit 'a605dafc27f69b37eca60579b34e97145f3caca3':
audioflinger: extend max i/p channel to 8 channels
Change-Id: Iefd24213da12d8635d2672454c2cd40fb6ba96a4
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 7b2bf98..91cb401 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -2112,8 +2112,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_2) &&
- (audio_channel_count_from_in_mask(config->channel_mask) <= FCC_2)) {
+ (audio_channel_count_from_in_mask(halconfig.channel_mask) <= FCC_8) &&
+ (audio_channel_count_from_in_mask(config->channel_mask) <= FCC_8)) {
// 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 = NULL;