diff options
author | Jean-Baptiste Queru <jbq@google.com> | 2012-08-10 12:44:02 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-10 12:44:02 -0700 |
commit | fcfc61da927e98d18cdcb53da8fa0a8a32ee1422 (patch) | |
tree | 7dd8aadcffc35c98504f35d69fe467c0a8e8f397 /services/audioflinger/AudioMixer.cpp | |
parent | 7edbacf24e60c01e2d3b10715ec8f9cc2f55c11a (diff) | |
parent | ff4c64d6b1b58494a1b15f1a664e5c421d095d15 (diff) | |
download | frameworks_av-fcfc61da927e98d18cdcb53da8fa0a8a32ee1422.zip frameworks_av-fcfc61da927e98d18cdcb53da8fa0a8a32ee1422.tar.gz frameworks_av-fcfc61da927e98d18cdcb53da8fa0a8a32ee1422.tar.bz2 |
am ff4c64d6: am c64a1787: Merge "Fix initialization of audio mixer track resources for MIPS."
* commit 'ff4c64d6b1b58494a1b15f1a664e5c421d095d15':
Fix initialization of audio mixer track resources for MIPS.
Diffstat (limited to 'services/audioflinger/AudioMixer.cpp')
-rw-r--r-- | services/audioflinger/AudioMixer.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp index 3a8c54d..a9814a1 100644 --- a/services/audioflinger/AudioMixer.cpp +++ b/services/audioflinger/AudioMixer.cpp @@ -93,8 +93,12 @@ bool AudioMixer::isMultichannelCapable = false; effect_descriptor_t AudioMixer::dwnmFxDesc; +// Ensure mConfiguredNames bitmask is initialized properly on all architectures. +// The value of 1 << x is undefined in C when x >= 32. + AudioMixer::AudioMixer(size_t frameCount, uint32_t sampleRate, uint32_t maxNumTracks) - : mTrackNames(0), mConfiguredNames((1 << maxNumTracks) - 1), mSampleRate(sampleRate) + : mTrackNames(0), mConfiguredNames((maxNumTracks >= 32 ? 0 : 1 << maxNumTracks) - 1), + mSampleRate(sampleRate) { // AudioMixer is not yet capable of multi-channel beyond stereo COMPILE_TIME_ASSERT_FUNCTION_SCOPE(2 == MAX_NUM_CHANNELS); |