commit 8ba3c76c583c075a2dae725a3c8a8380da199904
author Eric Laurent <elaurent@google.com> Tue Jul 01 20:26:35 2014 -0700
committer Eric Laurent <elaurent@google.com> Tue Jul 01 20:26:35 2014 -0700
tree 500fff0e0b417d01ef4a11835f90822bbfe0c7e8
parent 976f5e8842dfbe6054af465da33da8ded1e83a69

audio: fixed channel count determination from channel mask

Do not use popcount() to derive channel count from channel mask.

Bug: 15000850.
Change-Id: I478b4c4e0076c2fdf4b9e6c007f49a9da72931ba

audio/audio_hw.c

diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index bcec532..ffad231 100644
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -661,7 +661,7 @@
     }
 
     /* Reduce number of channels, if necessary */
-    if (popcount(out_get_channels(&stream->common)) >
+    if (audio_channel_count_from_out_mask(out_get_channels(&stream->common)) >
                  (int)out->pcm_config->channels) {
         unsigned int i;
 
@@ -1171,7 +1171,7 @@
     size = (pcm_config_in.period_size * config->sample_rate) / pcm_config_in.rate;
     size = ((size + 15) / 16) * 16;
 
-    return (size * popcount(config->channel_mask) *
+    return (size * audio_channel_count_from_in_mask(config->channel_mask) *
                 audio_bytes_per_sample(config->format));
 }