commit 88db5c37ada554ca6cd543f07a6af10bd1e18794
author Eric Laurent <elaurent@google.com> Wed Jun 04 19:21:56 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 04 19:21:57 2014 +0000
tree 2c8bacc38f5e462df3961b59482436b106b191fb
parent dd1253294110f9626eac18839632de7d6102cbcc
parent 0078c7cc59082d32799b9097a81a0341fe98619d

Merge "AudioSystem JNI: fix audio gain channel count" into lmp-preview-dev

core/jni/android_media_AudioSystem.cpp

diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp
index 0f7e140..bf47dd3 100644
--- a/core/jni/android_media_AudioSystem.cpp
+++ b/core/jni/android_media_AudioSystem.cpp
@@ -613,8 +613,12 @@
                 goto exit;
             }
         }
-        //TODO: replace popcount by audio utils function mask to count
-        int numValues = popcount(nAudioPortConfig->gain.channel_mask);
+        int numValues;
+        if (useInMask) {
+            numValues = audio_channel_count_from_in_mask(nAudioPortConfig->gain.channel_mask);
+        } else {
+            numValues = audio_channel_count_from_out_mask(nAudioPortConfig->gain.channel_mask);
+        }
         jGainValues = env->NewIntArray(numValues);
         if (jGainValues == NULL) {
             ALOGV("convertAudioPortConfigFromNative could not create gain values %d", numValues);