From 22da5b272a125155f2b33f991b44af9620c205ad Mon Sep 17 00:00:00 2001
From: Jasmine Cha <chajasmine@google.com>
Date: Wed, 12 Apr 2023 14:42:45 +0800
Subject: [PATCH] audio: update table

- move control Mic Spatial Module Enable to code.
- add camcorder mic setting.
- move definition of Waves instance id number to code.

Bug: 206738075
Test: manual test/ host test
 vendor.google.whitechapel.audio.hal.audio.tuner_tests

Change-Id: I8ba5dee5a6f5a25f1b208a8cd305a0f9141b5e8a
Signed-off-by: Jasmine Cha <chajasmine@google.com>
---
 .../audio_platform_configuration_aidl.xml        |  5 ++---
 audio/cheetah/aidl_config/mixer_paths_aidl.xml   | 16 +++++++++++++---
 .../audio_platform_configuration_aidl.xml        | 11 ++++-------
 audio/panther/aidl_config/mixer_paths_aidl.xml   | 16 +++++++++++++---
 4 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml b/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml
index c1739fd..bc050e3 100644
--- a/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml
+++ b/audio/cheetah/aidl_config/audio_platform_configuration_aidl.xml
@@ -63,9 +63,8 @@
 
   <!-- The tuner_builder: format is "type="x" codec_name="y" argu="z". argu is optional. -->
   <tuner_builder>
-    <tuner type="playback" name="waves" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN" />
-    <tuner type="telephony" name="fortemedia"
-      argu="VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y" />
+    <tuner type="playback" name="waves" argu="Sink=SPK ThermistorsName=VIRTUAL-SKIN" />
+    <tuner type="telephony" name="fortemedia" argu="VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y CCA=y" />
     <tuner type="capture" name="gs_capture" />
   </tuner_builder>
 </audio_platform_configuration>
diff --git a/audio/cheetah/aidl_config/mixer_paths_aidl.xml b/audio/cheetah/aidl_config/mixer_paths_aidl.xml
index 17c4660..894ef4e 100644
--- a/audio/cheetah/aidl_config/mixer_paths_aidl.xml
+++ b/audio/cheetah/aidl_config/mixer_paths_aidl.xml
@@ -254,7 +254,6 @@
 
   <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_ON" />
   <ctl name="Voice Call Mic Source" value="Builtin_MIC" />
-  <ctl name="Mic Spatial Module Enable" value="0" />
   <ctl name="Audio Capture Eraser Enable" value="0" />
 
   <!-- audio PDM mic default state -->
@@ -738,7 +737,6 @@
   </path>
 
   <path name="back-microphones">
-    <ctl name="Mic Spatial Module Enable" value="1" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
@@ -757,8 +755,20 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
+  <path name="microphones (CAMCORDER)">
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3"/>
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
+    <ctl name="MIC DC Blocker" value="1"/>
+    <ctl name="MIC Record Soft Gain (dB)" value="0"/>
+  </path>
+
+  <path name="back-microphones (CAMCORDER)">
+    <path name="microphones (CAMCORDER)" />
+  </path>
+
   <path name="camcorder-mic">
-    <ctl name="Mic Spatial Module Enable" value="1" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
diff --git a/audio/panther/aidl_config/audio_platform_configuration_aidl.xml b/audio/panther/aidl_config/audio_platform_configuration_aidl.xml
index f518bb3..bc050e3 100644
--- a/audio/panther/aidl_config/audio_platform_configuration_aidl.xml
+++ b/audio/panther/aidl_config/audio_platform_configuration_aidl.xml
@@ -54,20 +54,17 @@
     <voip_path device="usb" value="0.01,0.02,0.04,0.1,0.21,0.47,1.0" />
   </voip_db_mapping>
 
-  <!-- The device_builder: format is "type="x" codec_name="y" argu="z". name and argu are
-    optional. -->
+  <!-- The device_builder: format is "type="x" codec_name="y" argu="z". name and argu are optional. -->
   <device_builder>
     <device type="bt" />
     <device type="usb" argu="MaxSamplingRate=96000,UnsupportedFormat=S24_LE" />
-    <device type="speaker" codec_name="cs35l41"
-      argu="SpeakerNum=4,Rotation,AcousticShockProtection" />
+    <device type="speaker" codec_name="cs35l41" argu="SpeakerNum=4,Rotation,AcousticShockProtection" />
   </device_builder>
 
   <!-- The tuner_builder: format is "type="x" codec_name="y" argu="z". argu is optional. -->
   <tuner_builder>
-    <tuner type="playback" name="waves" argu="Sink=SPK:1 ThermistorsName=VIRTUAL-SKIN" />
-    <tuner type="telephony" name="fortemedia"
-      argu="VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y" />
+    <tuner type="playback" name="waves" argu="Sink=SPK ThermistorsName=VIRTUAL-SKIN" />
+    <tuner type="telephony" name="fortemedia" argu="VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000 BOOST_USB_SWB_CLK=y CCA=y" />
     <tuner type="capture" name="gs_capture" />
   </tuner_builder>
 </audio_platform_configuration>
diff --git a/audio/panther/aidl_config/mixer_paths_aidl.xml b/audio/panther/aidl_config/mixer_paths_aidl.xml
index 17c4660..894ef4e 100644
--- a/audio/panther/aidl_config/mixer_paths_aidl.xml
+++ b/audio/panther/aidl_config/mixer_paths_aidl.xml
@@ -254,7 +254,6 @@
 
   <ctl name="AoC Modem Downlink ASRC Mode" value="ASP_ON" />
   <ctl name="Voice Call Mic Source" value="Builtin_MIC" />
-  <ctl name="Mic Spatial Module Enable" value="0" />
   <ctl name="Audio Capture Eraser Enable" value="0" />
 
   <!-- audio PDM mic default state -->
@@ -738,7 +737,6 @@
   </path>
 
   <path name="back-microphones">
-    <ctl name="Mic Spatial Module Enable" value="1" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
@@ -757,8 +755,20 @@
     <ctl name="MIC Record Soft Gain (dB)" value="0" />
   </path>
 
+  <path name="microphones (CAMCORDER)">
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0"/>
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3"/>
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
+    <ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1"/>
+    <ctl name="MIC DC Blocker" value="1"/>
+    <ctl name="MIC Record Soft Gain (dB)" value="0"/>
+  </path>
+
+  <path name="back-microphones (CAMCORDER)">
+    <path name="microphones (CAMCORDER)" />
+  </path>
+
   <path name="camcorder-mic">
-    <ctl name="Mic Spatial Module Enable" value="1" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="0" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="3" />
     <ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />