commit 31d944cd941a5f4d75479278eb75aa89854c7c47
author Xiaojun Sang <xsang@codeaurora.org> Fri Oct 12 16:50:41 2018 +0800
committer Xiaojun Sang <xsang@codeaurora.org> Mon Oct 22 15:52:10 2018 +0800
tree 3c6562117ad5326086b7b907f02fc7f509889a66
parent 82debc53f1539546964d89e81c5105683a7b0fea

hal: set backend channel number to one for mono speaker

Channel number is wrong for mono device. It causes channel
mismatch in ADSP. Set backend channel number to one for mono device.
Update backend info in case of channel mismatch.

Change-Id: I76d7e77c2e3cee11e38d7b1d4033d2227f8c97ce

hal/msm8974/platform.c

diff --git a/hal/msm8974/platform.c b/hal/msm8974/platform.c
index 1b6b5e0..ef3fc52 100755
--- a/hal/msm8974/platform.c
+++ b/hal/msm8974/platform.c
@@ -3244,7 +3244,12 @@
         snd_device == SND_DEVICE_OUT_SPEAKER_PROTECTED ||
         snd_device == SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT ||
         snd_device == SND_DEVICE_OUT_SPEAKER_PROTECTED_RAS ||
-        snd_device == SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT_RAS) {
+        snd_device == SND_DEVICE_OUT_SPEAKER_PROTECTED_VBAT_RAS ||
+        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER ||
+        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_WSA ||
+        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_VBAT ||
+        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED ||
+        snd_device == SND_DEVICE_OUT_VOICE_SPEAKER_PROTECTED_VBAT ) {
         ret = true;
     }
     return ret;
@@ -6234,6 +6239,9 @@
         }
     }
 
+    if (!(hw_info_is_stereo_spkr(my_data->hw_info)) && check_snd_device_is_speaker(snd_device))
+        channels = 1;
+
     /* Native playback is preferred for Headphone/HS device over 192Khz */
     if (!voice_call_active && codec_device_supports_native_playback(usecase->devices)) {
         if (audio_is_true_native_stream_active(adev)) {
@@ -6373,6 +6381,7 @@
     // Force routing if the expected bitwdith or samplerate
     // is not same as current backend comfiguration
     if ((bit_width != my_data->current_backend_cfg[backend_idx].bit_width) ||
+        (channels != my_data->current_backend_cfg[backend_idx].channels) ||
         (sample_rate != my_data->current_backend_cfg[backend_idx].sample_rate) ||
          passthrough_enabled || channels_updated || service_interval_update ) {
         backend_cfg->bit_width = bit_width;
@@ -6430,12 +6439,7 @@
         backend_cfg.bit_width = usecase->stream.out->bit_width;
         backend_cfg.sample_rate = usecase->stream.out->sample_rate;
         backend_cfg.format = usecase->stream.out->format;
-        if (!(hw_info_is_stereo_spkr(my_data->hw_info)) &&
-             check_snd_device_is_speaker(snd_device))
-            backend_cfg.channels = 1;
-        else
-            backend_cfg.channels =
-                audio_channel_count_from_out_mask(usecase->stream.out->channel_mask);
+        backend_cfg.channels = audio_channel_count_from_out_mask(usecase->stream.out->channel_mask);
     }
     if (audio_extn_is_dsp_bit_width_enforce_mode_supported(usecase->stream.out->flags) &&
                 (adev->dsp_bit_width_enforce_mode > backend_cfg.bit_width))