diff options
| author | Joshua Lang <joshualang@google.com> | 2016-12-21 12:23:03 -0800 |
|---|---|---|
| committer | Joshua Lang <joshualang@google.com> | 2017-01-19 12:46:54 -0800 |
| commit | 3eb39a76c87053408fdc0cbf151b1cfb5e73099e (patch) | |
| tree | 91ddf941f6f1f2e37d680bf8b486cbe81ebc3941 /audio | |
| parent | 19297e0f2bbc7043f25b428599d4f50d7416f20a (diff) | |
| download | device_generic_goldfish-3eb39a76c87053408fdc0cbf151b1cfb5e73099e.tar.gz device_generic_goldfish-3eb39a76c87053408fdc0cbf151b1cfb5e73099e.tar.bz2 device_generic_goldfish-3eb39a76c87053408fdc0cbf151b1cfb5e73099e.zip | |
Fix audio input channel verification
Channel mask verification bug caused wrong channel count to be
selected.
Test: Run CtsMedia module
Change-Id: I2275511a136bfc61bdf57a09ae800a37b145e948
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/audio_hw.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 10fea6fd..a50357fa 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -749,7 +749,7 @@ static size_t get_input_buffer_size(uint32_t sample_rate, audio_format_t format, 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 int adev_get_mic_mute(const struct audio_hw_device *dev, bool *state) 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); } |