commit c0a82240086bc2bd0e5215ffab89c01dc640f0c9
author qctecmdr <qctecmdr@localhost> Wed Dec 23 20:30:02 2020 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Dec 23 20:30:02 2020 -0800
tree 20e351da6c534bbb69cb02148a5520d5ece3dd9b
parent a340d588fe74228b5ef5ef018f6a061adc9fb3ab
parent 43c45c4eeb52fa36c7ff209ba4c539f0ec437167

Merge "AHAL: setting 4 channel mapping info for proxy device"

hal/audio_extn/audio_extn.c

diff --git a/hal/audio_extn/audio_extn.c b/hal/audio_extn/audio_extn.c
index 32051a8..ca06e59 100755
--- a/hal/audio_extn/audio_extn.c
+++ b/hal/audio_extn/audio_extn.c
@@ -1294,6 +1294,12 @@
         set_values[0] = PCM_CHANNEL_FL;
         set_values[1] = PCM_CHANNEL_FR;
         break;
+     case 4:
+        set_values[0] = PCM_CHANNEL_FL;
+        set_values[1] = PCM_CHANNEL_FR;
+        set_values[2] = PCM_CHANNEL_LS;
+        set_values[3] = PCM_CHANNEL_LFE;
+        break;
     case 6:
         set_values[0] = PCM_CHANNEL_FL;
         set_values[1] = PCM_CHANNEL_FR;
@@ -1390,7 +1396,7 @@
     }
     mixer_ctl_set_enum_by_string(ctl, channel_cnt_str);
 
-    if (channel_count == 6 || channel_count == 8 || channel_count == 2) {
+    if (channel_count == 6 || channel_count == 8 || channel_count == 2 || channel_count == 4) {
         ret = afe_proxy_set_channel_mapping(adev, channel_count, snd_device);
     } else {
         ALOGE("%s: set unsupported channel count(%d)",  __func__, channel_count);