diff options
| author | Eric Laurent <elaurent@google.com> | 2015-05-09 00:34:14 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-09 00:34:15 +0000 |
| commit | ef2c7aa096d95bbc74a75078c07f300fb2d94172 (patch) | |
| tree | 5d603278cc8934d3aa7a5826e09ea0349ad432c7 /services | |
| parent | 70f0d62d5f9b81d53f4ca28cd5dbb39ca0a2cdc2 (diff) | |
| parent | 1924c9b12eae39d074235a3ec25770795d220157 (diff) | |
| download | frameworks_av-ef2c7aa096d95bbc74a75078c07f300fb2d94172.zip frameworks_av-ef2c7aa096d95bbc74a75078c07f300fb2d94172.tar.gz frameworks_av-ef2c7aa096d95bbc74a75078c07f300fb2d94172.tar.bz2 | |
Merge "Revert "Revert "Enable full floating point path in AudioMixer""" into mnc-dev
Diffstat (limited to 'services')
| -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 193fd64..7040af4 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. Otherwise the -// original code will be used. This is false for now. -static const bool kUseNewMixer = false; +// 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 kUseFloat to true to allow floating input into the mixer engine. // If kUseNewMixer is false, this is ignored or may be overridden internally |