From 389cfdbb9a92a438a0d7710321c2964c7ad55eca Mon Sep 17 00:00:00 2001 From: Andy Hung Date: Thu, 7 Aug 2014 17:49:53 -0700 Subject: Fix effect and mono sink handling. Do not permit mixing to mono sink in AudioFlinger. Allow effects on mono sink if not Mixer thread (e.g. Record). Bug: 16863095 Change-Id: I8b232fc1fb3f07bf017020c5d4f9ace644dec6d8 --- services/audioflinger/AudioFlinger.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'services/audioflinger/AudioFlinger.h') diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 31c5a1a..83e4ae1 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -340,7 +340,8 @@ private: uint32_t channelCount = FCC_2; // stereo is default if (kEnableExtendedChannels) { channelCount = audio_channel_count_from_out_mask(channelMask); - if (channelCount > AudioMixer::MAX_NUM_CHANNELS) { + if (channelCount < FCC_2 // mono is not supported at this time + || channelCount > AudioMixer::MAX_NUM_CHANNELS) { return false; } } -- cgit v1.1