commit 3eb39a76c87053408fdc0cbf151b1cfb5e73099e
author Joshua Lang <joshualang@google.com> Wed Dec 21 12:23:03 2016 -0800
committer Joshua Lang <joshualang@google.com> Thu Jan 19 12:46:54 2017 -0800
tree 91ddf941f6f1f2e37d680bf8b486cbe81ebc3941
parent 19297e0f2bbc7043f25b428599d4f50d7416f20a

Fix audio input channel verification

Channel mask verification bug caused wrong channel count to be
selected.

Test: Run CtsMedia module
Change-Id: I2275511a136bfc61bdf57a09ae800a37b145e948

audio/audio_hw.c

diff --git a/audio/audio_hw.c b/audio/audio_hw.c
index 10fea6f..a50357f 100644
--- a/audio/audio_hw.c
+++ b/audio/audio_hw.c
@@ -749,7 +749,7 @@
     size_t size;
     size_t device_rate;
     int channel_count = popcount(channel_mask);
-    if (check_input_parameters(sample_rate, format, channel_count) != 0)
+    if (check_input_parameters(sample_rate, format, channel_mask) != 0)
         return 0;
 
     size = sample_rate*IN_PERIOD_MS/1000;
@@ -1287,9 +1287,7 @@
 static size_t adev_get_input_buffer_size(const struct audio_hw_device *dev,
                                          const struct audio_config *config)
 {
-    size_t size;
-    int channel_count = popcount(config->channel_mask);
-    return get_input_buffer_size(config->sample_rate, config->format, channel_count);
+    return get_input_buffer_size(config->sample_rate, config->format, config->channel_mask);
 }