diff options
| author | Eric Laurent <elaurent@google.com> | 2015-05-07 23:36:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-07 23:36:02 +0000 |
| commit | 6ff06612638a13faa85c6219d42a9c4b645003d9 (patch) | |
| tree | 5e9c9d52a5c51491e8d88abfe77cc9b31c4a0dec | |
| parent | e5e9a0df67ae23d16bf48e4a8fd652684434a3b6 (diff) | |
| parent | 5dcaebbea5dca62ca55d6137777caa67fc757dd6 (diff) | |
| download | frameworks_av-6ff06612638a13faa85c6219d42a9c4b645003d9.zip frameworks_av-6ff06612638a13faa85c6219d42a9c4b645003d9.tar.gz frameworks_av-6ff06612638a13faa85c6219d42a9c4b645003d9.tar.bz2 | |
Merge "Revert "Enable full floating point path in AudioMixer"" into mnc-dev
| -rw-r--r-- | services/audioflinger/AudioMixer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp index 7040af4..193fd64 100644 --- a/services/audioflinger/AudioMixer.cpp +++ b/services/audioflinger/AudioMixer.cpp @@ -66,9 +66,9 @@ #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0])) #endif -// Set kUseNewMixer to true to use the new mixer engine always. Otherwise the -// original code will be used for stereo sinks, the new mixer for multichannel. -static const bool kUseNewMixer = true; +// Set kUseNewMixer to true to use the new mixer engine. Otherwise the +// original code will be used. This is false for now. +static const bool kUseNewMixer = false; // Set kUseFloat to true to allow floating input into the mixer engine. // If kUseNewMixer is false, this is ignored or may be overridden internally |