commit 1f439e1cf16a29347288ba9ddd06c0b6d086a145
author Andy Hung <hunga@google.com> Tue May 19 12:57:41 2015 -0700
committer Andy Hung <hunga@google.com> Tue May 19 13:08:45 2015 -0700
tree d4a7b6501598b794b0ceffcf6c473520fda5e323
parent 64b6cb2cd5646a5ffcdb2cccee09a170ef2882d5

Update FastTrack channel conversion check

Change-Id: Ia1a3124e6408859bf4d95ff9fd95dda6970a4a7f

services/audioflinger/Threads.cpp

diff --git a/services/audioflinger/Threads.cpp b/services/audioflinger/Threads.cpp
index 594ed05..bd29207 100644
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@@ -1572,10 +1572,12 @@
             ) &&
             // PCM data
             audio_is_linear_pcm(format) &&
-            // identical channel mask to sink, or mono in and stereo sink
+            // TODO: extract as a data library function that checks that a computationally
+            // expensive downmixer is not required: isFastOutputChannelConversion()
             (channelMask == mChannelMask ||
-                    (channelMask == AUDIO_CHANNEL_OUT_MONO &&
-                            mChannelMask == AUDIO_CHANNEL_OUT_STEREO)) &&
+                    mChannelMask != AUDIO_CHANNEL_OUT_STEREO ||
+                    (channelMask == AUDIO_CHANNEL_OUT_MONO
+                            /* && mChannelMask == AUDIO_CHANNEL_OUT_STEREO */)) &&
             // hardware sample rate
             (sampleRate == mSampleRate) &&
             // normal mixer has an associated fast mixer