summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorEric Laurent <elaurent@google.com>2015-05-08 23:18:07 +0000
committerEric Laurent <elaurent@google.com>2015-05-08 23:18:07 +0000
commit1924c9b12eae39d074235a3ec25770795d220157 (patch)
tree2db493f9d8a10aece6aded5af55afb782f2bb389 /services
parent5dcaebbea5dca62ca55d6137777caa67fc757dd6 (diff)
downloadframeworks_av-1924c9b12eae39d074235a3ec25770795d220157.zip
frameworks_av-1924c9b12eae39d074235a3ec25770795d220157.tar.gz
frameworks_av-1924c9b12eae39d074235a3ec25770795d220157.tar.bz2
Revert "Revert "Enable full floating point path in AudioMixer""
This reverts commit 5dcaebbea5dca62ca55d6137777caa67fc757dd6. Change-Id: I8bfc668baf53dc03a9516c50e2a4d625ec767d0a
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 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