From 1c6bf15dfd6ee19bf6ac43367028accdcb2cc4c7 Mon Sep 17 00:00:00 2001
From: Jasmine Cha <chajasmine@google.com>
Date: Fri, 14 Apr 2023 14:13:25 +0800
Subject: [PATCH 1/2] 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: I795402e8c460b01a148ba9e3b032143fddacd3cb
Signed-off-by: Jasmine Cha <chajasmine@google.com>
---
 .../audio_platform_configuration_aidl.xml        |  5 ++---
 audio/lynx/aidl_config/mixer_paths_aidl.xml      | 16 +++++++++++++---
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/audio/lynx/aidl_config/audio_platform_configuration_aidl.xml b/audio/lynx/aidl_config/audio_platform_configuration_aidl.xml
index c1739fd..bc050e3 100644
--- a/audio/lynx/aidl_config/audio_platform_configuration_aidl.xml
+++ b/audio/lynx/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/lynx/aidl_config/mixer_paths_aidl.xml b/audio/lynx/aidl_config/mixer_paths_aidl.xml
index 17c4660..894ef4e 100644
--- a/audio/lynx/aidl_config/mixer_paths_aidl.xml
+++ b/audio/lynx/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" />

From 407fc5eff535251b6fc97f52c3d084183a1946ef Mon Sep 17 00:00:00 2001
From: Poomarin Phloyphisut <poomarin@google.com>
Date: Tue, 18 Apr 2023 13:04:13 +0000
Subject: [PATCH 2/2] [USB Audio] Enable 192k support sample rate to hifi usb

related cl: ag/22549253

Test: Local Test.
Bug: 198122814
Change-Id: I43e2ca3f17bd5e39f400dd86b33a7230db9574f5
---
 audio/lynx/config/audio_platform_configuration.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/audio/lynx/config/audio_platform_configuration.xml b/audio/lynx/config/audio_platform_configuration.xml
index 1a3aba5..5443432 100644
--- a/audio/lynx/config/audio_platform_configuration.xml
+++ b/audio/lynx/config/audio_platform_configuration.xml
@@ -286,7 +286,7 @@
 
     <device_handle>
         <handler libname="audio_bt_aoc.so"/>
-        <handler libname="audio_usb_aoc.so" argu="MaxSamplingRate=96000,UnsupportedFormat=S24_LE"/>
+        <handler libname="audio_usb_aoc.so" argu="MaxSamplingRate=192000,UnsupportedFormat=S24_LE,MaxCapPacketInterval=125,MaxCapSampleRate=192000,MaxCapBitWidth=32,MaxCapChannel=2,EnableHifi192kMultichannel=0"/>
     </device_handle>
 
     <external_module>