From 9d767c69d1d5b5ef5b42484fd7257823941d8b80 Mon Sep 17 00:00:00 2001
From: yixuanjiang <yixuanjiang@google.com>
Date: Thu, 15 Dec 2022 15:33:53 +0800
Subject: [PATCH] audio: support ultrasonic capture 3 ch

Bug: 258685440
Test: local
Signed-off-by: yixuanjiang <yixuanjiang@google.com>
Change-Id: Ic3b02292ddd74a875b3f0a29f27ae9835864c7a5
---
 audio/tangorpro/config/audio_policy_configuration.xml           | 2 +-
 .../config/audio_policy_configuration_a2dp_offload_disabled.xml | 2 +-
 .../config/audio_policy_configuration_bluetooth_legacy_hal.xml  | 2 +-
 audio/tangorpro/config/mixer_paths.xml                          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/audio/tangorpro/config/audio_policy_configuration.xml b/audio/tangorpro/config/audio_policy_configuration.xml
index 5f16ae4..5f65034 100644
--- a/audio/tangorpro/config/audio_policy_configuration.xml
+++ b/audio/tangorpro/config/audio_policy_configuration.xml
@@ -123,7 +123,7 @@
                 <mixPort name="ultrasound input" role="sink"
                          flags="AUDIO_INPUT_FLAG_ULTRASOUND">
                     <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="96000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
+                             samplingRates="96000" channelMasks="AUDIO_CHANNEL_INDEX_MASK_3"/>
                 </mixPort>
             </mixPorts>
             <devicePorts>
diff --git a/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml b/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml
index cf2a4e1..319c16f 100644
--- a/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml
+++ b/audio/tangorpro/config/audio_policy_configuration_a2dp_offload_disabled.xml
@@ -123,7 +123,7 @@
                 <mixPort name="ultrasound input" role="sink"
                          flags="AUDIO_INPUT_FLAG_ULTRASOUND">
                     <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="96000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
+                             samplingRates="96000" channelMasks="AUDIO_CHANNEL_INDEX_MASK_3"/>
                 </mixPort>
             </mixPorts>
             <devicePorts>
diff --git a/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml b/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml
index 5f9dcd4..8a92d35 100644
--- a/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml
+++ b/audio/tangorpro/config/audio_policy_configuration_bluetooth_legacy_hal.xml
@@ -123,7 +123,7 @@
                 <mixPort name="ultrasound input" role="sink"
                          flags="AUDIO_INPUT_FLAG_ULTRASOUND">
                     <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
-                             samplingRates="96000" channelMasks="AUDIO_CHANNEL_IN_STEREO"/>
+                             samplingRates="96000" channelMasks="AUDIO_CHANNEL_INDEX_MASK_3"/>
                 </mixPort>
             </mixPorts>
             <devicePorts>
diff --git a/audio/tangorpro/config/mixer_paths.xml b/audio/tangorpro/config/mixer_paths.xml
index 7a9bf94..1eed9fe 100644
--- a/audio/tangorpro/config/mixer_paths.xml
+++ b/audio/tangorpro/config/mixer_paths.xml
@@ -921,7 +921,7 @@
     <path name="ultrasound-mic">
         <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="0" value="0"/>
         <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="1" value="3"/>
-        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="-1"/>
+        <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="2" value="2"/>
         <ctl name="BUILDIN US MIC ID CAPTURE LIST" id="3" value="-1"/>
     </path>