diff options
| author | Andy Hung <hunga@google.com> | 2014-08-08 17:28:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-07 18:49:59 +0000 |
| commit | 0912a5738d6baf2df7cd62e877240e3807b4b21f (patch) | |
| tree | 58e7ad3a76e384408d02cdef7a9c9215a8000878 /services/audioflinger/AudioFlinger.h | |
| parent | 317bb9163befccd87348c11bdfc0044e629b362b (diff) | |
| parent | 389cfdbb9a92a438a0d7710321c2964c7ad55eca (diff) | |
| download | frameworks_av-0912a5738d6baf2df7cd62e877240e3807b4b21f.zip frameworks_av-0912a5738d6baf2df7cd62e877240e3807b4b21f.tar.gz frameworks_av-0912a5738d6baf2df7cd62e877240e3807b4b21f.tar.bz2 | |
Merge "Fix effect and mono sink handling." into lmp-dev
Diffstat (limited to 'services/audioflinger/AudioFlinger.h')
| -rw-r--r-- | services/audioflinger/AudioFlinger.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/services/audioflinger/AudioFlinger.h b/services/audioflinger/AudioFlinger.h index 4e9d49b..753314f 100644 --- a/services/audioflinger/AudioFlinger.h +++ b/services/audioflinger/AudioFlinger.h @@ -343,7 +343,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; } } |