summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorAndy Hung <hunga@google.com>2015-03-20 01:52:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-20 01:52:16 +0000
commit0e4421286b92a81e952f53210227adbf05d97c25 (patch)
treee9a496cd2d5ec0bc2612e845732c2bbd5447d9fd /services
parent7c963e92bc11d4b6a22696c51f9abf42987a1f74 (diff)
parent5b8fde71e08f57478ef25d040fc5f66294011ac6 (diff)
downloadframeworks_av-0e4421286b92a81e952f53210227adbf05d97c25.zip
frameworks_av-0e4421286b92a81e952f53210227adbf05d97c25.tar.gz
frameworks_av-0e4421286b92a81e952f53210227adbf05d97c25.tar.bz2
Merge "Enable full floating point path in AudioMixer"
Diffstat (limited to 'services')
-rw-r--r--services/audioflinger/AudioMixer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/services/audioflinger/AudioMixer.cpp b/services/audioflinger/AudioMixer.cpp
index 93d821a..dddca02 100644
--- a/services/audioflinger/AudioMixer.cpp
+++ b/services/audioflinger/AudioMixer.cpp
@@ -69,9 +69,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