commit be55c0d23b02f9de9f295f3bca2f7cd7f016c4d6
author Eric Laurent <elaurent@google.com> Wed Jul 02 16:46:18 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 01 23:17:33 2014 +0000
tree 9ff74181637eb00977aa23b474607d46a2802880
parent df0697e392c1789a49966d5091c2ee9e1003a02f
parent dbf55665c5c4802cbfc56463198805be48ec75af

Merge "audio: fixed channel count determination from channel mask"

core/jni/android_media_AudioRecord.cpp

diff --git a/core/jni/android_media_AudioRecord.cpp b/core/jni/android_media_AudioRecord.cpp
index a54eba1..c8812fc 100644
--- a/core/jni/android_media_AudioRecord.cpp
+++ b/core/jni/android_media_AudioRecord.cpp
@@ -150,7 +150,7 @@
         ALOGE("Error creating AudioRecord: channel mask %#x is not valid.", channelMask);
         return (jint) AUDIORECORD_ERROR_SETUP_INVALIDCHANNELMASK;
     }
-    uint32_t channelCount = popcount(channelMask);
+    uint32_t channelCount = audio_channel_count_from_in_mask(channelMask);
 
     // compare the format against the Java constants
     audio_format_t format = audioFormatToNative(audioFormat);

core/jni/android_media_AudioTrack.cpp

diff --git a/core/jni/android_media_AudioTrack.cpp b/core/jni/android_media_AudioTrack.cpp
index 677c230..7e2448e 100644
--- a/core/jni/android_media_AudioTrack.cpp
+++ b/core/jni/android_media_AudioTrack.cpp
@@ -205,7 +205,7 @@
         return (jint) AUDIOTRACK_ERROR_SETUP_INVALIDCHANNELMASK;
     }
 
-    uint32_t channelCount = popcount(nativeChannelMask);
+    uint32_t channelCount = audio_channel_count_from_out_mask(nativeChannelMask);
 
     // check the format.
     // This function was called from Java, so we compare the format against the Java constants