audio: update aidl tables

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

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

Change-Id: Id3dbc4c0d694967421cbc516ff42709876845e16
Signed-off-by: Jasmine Cha <chajasmine@google.com>
This commit is contained in:
Jasmine Cha 2023-04-18 12:42:35 +08:00
parent debc020497
commit 97b149659a
4 changed files with 30 additions and 10 deletions

View file

@ -182,8 +182,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>

View file

@ -255,7 +255,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 -->
@ -740,7 +739,6 @@
<!-- Tx device -->
<path name="handset-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="1"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
@ -766,7 +764,6 @@
</path>
<path name="speaker-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="1"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
@ -791,6 +788,19 @@
<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"/>

View file

@ -182,8 +182,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>

View file

@ -255,7 +255,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 -->
@ -740,7 +739,6 @@
<!-- Tx device -->
<path name="handset-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="1"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
@ -766,7 +764,6 @@
</path>
<path name="speaker-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="1"/>
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2"/>
@ -791,6 +788,19 @@
<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"/>