audio: update audio capture tuning

1. Support more camcorder tuning with different channels
2. Update the latest params on WNR, SUR, Linear gain, MBDRC module.

Bug: 181869495
Bug: 186721091
Bug: 174448901

Test: build pass
Signed-off-by: Carter Hsu <carterhsu@google.com>
Change-Id: I969b9bbb6a3fd74206dfc0bf385d9ebc1fddf194
This commit is contained in:
Carter Hsu 2021-05-25 12:15:11 +08:00
parent 604aa67bcf
commit f9d90fe79b
8 changed files with 26 additions and 50 deletions

View file

@ -174,7 +174,6 @@
<cfg id="IN_USB_TTY_FULL_MIC_BE_CFG" be_path="usb-headset-mic" codec_path="usb-headset-mic"/>
<cfg id="IN_USB_TTY_VCO_MIC_BE_CFG" be_path="NULL" codec_path="voice-speaker-mic"/>
<cfg id="IN_USB_TTY_HCO_MIC_BE_CFG" be_path="usb-headset-mic" codec_path="usb-headset-mic"/>
<cfg id="IN_HANDSET_MIC_BE_CFG" intf_id="BE_HW_TX_INTF_0" mux="HW_MUX_GP_0" tuning_id="10" codec_path="handset-mic" be_path="NULL"/>
<cfg id="IN_SPK_VI_BE_CFG" codec_path="NULL" be_path="spk-vi"/>
<cfg id="IN_CAMCORDER_LANDSCAPE_BE_CFG" tuning_id="70"/>
<cfg id="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG" tuning_id="71"/>
@ -182,6 +181,8 @@
<cfg id="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG" tuning_id="73"/>
<cfg id="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG" tuning_id="74"/>
<cfg id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" tuning_id="75"/>
<cfg id="IN_CAMCORDER_MIC_BE_CFG" tuning_id="70"/>
<cfg id="IN_CAMCORDER_TRIPLE_MIC_BE_CFG" tuning_id="70"/>
</cfg_attr>
<xlate_id>

View file

@ -8,7 +8,7 @@
<param id="0" max="3" name="opMode_" type="uint32"/>
</module>
<module id="5" name="Auto Gain Control">
<param default="1" id="0" max="3" name="opMode_" type="uint32"/>
<param default="0" id="0" max="3" name="opMode_" type="uint32"/>
<param default="48000" id="1" name="fs_" type="uint32"/>
<param default="1" id="2" name="numCh_" type="uint32"/>
<param default="1" id="3" name="chMask_" type="uint32"/>
@ -22,7 +22,7 @@
<param id="23" name="rmsTav" type="uint32"/>
</module>
<module id="6" name="Surround Record">
<param default="1" id="0" max="3" name="opMode_" type="uint32"/>
<param default="0" id="0" max="3" name="opMode_" type="uint32"/>
<param default="48000" id="1" name="fs_" type="uint32"/>
<param default="3" id="2" name="numCh_" type="uint32"/>
<param default="7" id="3" name="chMask_" type="uint32"/>
@ -45,7 +45,7 @@
<param default="2" id="29" name="ch2_assignFrom" type="int32"/>
</module>
<module id="7" name="Multi Channel IIR 2">
<param default="1" id="0" max="3" name="opMode_" type="uint32"/>
<param default="0" id="0" max="3" name="opMode_" type="uint32"/>
<param default="48000" id="1" name="fs_" type="uint32"/>
<param default="3" id="2" name="numCh_" type="uint32"/>
<param default="1" id="3" name="chMask_" type="uint32"/>
@ -59,7 +59,7 @@
</struct>
</module>
<module id="8" name="Multi Band DRC">
<param default="1" id="0" max="3" name="opMode_" type="uint32"/>
<param default="0" id="0" max="3" name="opMode_" type="uint32"/>
<param default="48000" id="1" name="fs_" type="uint32"/>
<param default="2" id="2" name="numCh_" type="uint32"/>
<param default="3" id="3" name="chMask_" type="uint32"/>
@ -108,8 +108,8 @@
<struct id="18">
<param max="30" min="-30" name="limiter_gain_dB" type="float"/>
<param max="0" min="-30" name="limiter_threadhold_dB" type="float"/>
<param max="100" min="0" name="limiter_attackTime_ms" type="uint32"/>
<param max="100" min="0" name="limiter_releaseTime_ms" type="uint32"/>
<param max="100" min="0" name="limiter_attackTime_ms" type="float"/>
<param max="100" min="0" name="limiter_releaseTime_ms" type="float"/>
</struct>
<struct id="19">
<param name="frequency0" type="uint32"/>
@ -117,7 +117,7 @@
</struct>
</module>
<module id="11" name="Stationary Noise Suppression">
<param default="1" id="0" max="3" name="opMode_" type="uint32"/>
<param default="0" id="0" max="3" name="opMode_" type="uint32"/>
<param default="48000" id="1" name="fs_" type="uint32"/>
<param default="2" id="2" name="numCh_" type="uint32"/>
<param default="3" id="3" name="chMask_" type="uint32"/>
@ -130,14 +130,14 @@
<param id="22" name="RELEASE_TIME" type="float"/>
</module>
<module id="14" name="Linear Gain">
<param default="1" id="0" max="3" name="opMode_" type="uint32"/>
<param default="0" id="0" max="3" name="opMode_" type="uint32"/>
<param default="48000" id="1" name="fs_" type="uint32"/>
<param default="1" id="2" name="numCh_" type="uint32"/>
<param default="1" id="3" name="chMask_" type="uint32"/>
<param id="16" name="Simple_gain" type="float"/>
</module>
<module id="17" name="Wind Noise Reduction">
<param default="1" id="0" max="3" name="opMode_" type="uint32"/>
<param default="0" id="0" max="3" name="opMode_" type="uint32"/>
<param default="48000" id="1" name="fs_" type="uint32"/>
<param default="2" id="2" name="numCh_" type="uint32"/>
<param default="3" id="3" name="chMask_" type="uint32"/>
@ -201,7 +201,7 @@
<param default="1000" id="73" name="GAIN_BOOSTING_COST" type="int32"/>
</module>
<module id="18" name="Multi Channel IIR 1">
<param default="1" id="0" max="3" name="opMode_" type="uint32"/>
<param default="0" id="0" max="3" name="opMode_" type="uint32"/>
<param default="48000" id="1" name="fs_" type="uint32"/>
<param default="2" id="2" name="numCh_" type="uint32"/>
<param default="3" id="3" name="chMask_" type="uint32"/>

View file

@ -174,7 +174,6 @@
<cfg id="IN_USB_TTY_FULL_MIC_BE_CFG" be_path="usb-headset-mic" codec_path="usb-headset-mic"/>
<cfg id="IN_USB_TTY_VCO_MIC_BE_CFG" be_path="NULL" codec_path="voice-speaker-mic"/>
<cfg id="IN_USB_TTY_HCO_MIC_BE_CFG" be_path="usb-headset-mic" codec_path="usb-headset-mic"/>
<cfg id="IN_HANDSET_MIC_BE_CFG" intf_id="BE_HW_TX_INTF_0" mux="HW_MUX_GP_0" tuning_id="10" codec_path="handset-mic" be_path="NULL"/>
<cfg id="IN_SPK_VI_BE_CFG" codec_path="NULL" be_path="spk-vi"/>
<cfg id="IN_CAMCORDER_LANDSCAPE_BE_CFG" tuning_id="70"/>
<cfg id="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG" tuning_id="71"/>
@ -182,6 +181,8 @@
<cfg id="IN_CAMCORDER_SELFIE_LANDSCAPE_BE_CFG" tuning_id="73"/>
<cfg id="IN_CAMCORDER_SELFIE_INVERT_LANDSCAPE_BE_CFG" tuning_id="74"/>
<cfg id="IN_CAMCORDER_SELFIE_PORTRAIT_BE_CFG" tuning_id="75"/>
<cfg id="IN_CAMCORDER_MIC_BE_CFG" tuning_id="70"/>
<cfg id="IN_CAMCORDER_TRIPLE_MIC_BE_CFG" tuning_id="70"/>
</cfg_attr>
<xlate_id>

View file

@ -348,15 +348,6 @@
<ctl name="USB_RX Mixer EP6" value="1"/>
</path>
<path name="deep-buffer-playbackP usb-tty-full">
</path>
<path name="deep-buffer-playbackP usb-tty-hco">
</path>
<path name="deep-buffer-playbackP usb-tty-vco">
</path>
<path name="deep-buffer-playbackP hearing-aid">
</path>
@ -384,15 +375,6 @@
<ctl name="USB_RX Mixer EP2" value="1"/>
</path>
<path name="low-latency-playbackP usb-tty-full">
</path>
<path name="low-latency-playbackP usb-tty-hco">
</path>
<path name="low-latency-playbackP usb-tty-vco">
</path>
<path name="low-latency-playbackP hearing-aid">
</path>
@ -413,15 +395,6 @@
<ctl name="USB_RX Mixer EP4" value="1"/>
</path>
<path name="raw-playbackP usb-tty-full">
</path>
<path name="raw-playbackP usb-tty-hco">
</path>
<path name="raw-playbackP usb-tty-vco">
</path>
<path name="raw-playbackP hearing-aid">
</path>

View file

@ -8,7 +8,7 @@
<param id="0" max="3" name="opMode_" type="uint32"/>
</module>
<module id="5" name="Auto Gain Control">
<param default="1" id="0" max="3" name="opMode_" type="uint32"/>
<param default="0" id="0" max="3" name="opMode_" type="uint32"/>
<param default="48000" id="1" name="fs_" type="uint32"/>
<param default="1" id="2" name="numCh_" type="uint32"/>
<param default="1" id="3" name="chMask_" type="uint32"/>
@ -22,7 +22,7 @@
<param id="23" name="rmsTav" type="uint32"/>
</module>
<module id="6" name="Surround Record">
<param default="1" id="0" max="3" name="opMode_" type="uint32"/>
<param default="0" id="0" max="3" name="opMode_" type="uint32"/>
<param default="48000" id="1" name="fs_" type="uint32"/>
<param default="3" id="2" name="numCh_" type="uint32"/>
<param default="7" id="3" name="chMask_" type="uint32"/>
@ -45,7 +45,7 @@
<param default="2" id="29" name="ch2_assignFrom" type="int32"/>
</module>
<module id="7" name="Multi Channel IIR 2">
<param default="1" id="0" max="3" name="opMode_" type="uint32"/>
<param default="0" id="0" max="3" name="opMode_" type="uint32"/>
<param default="48000" id="1" name="fs_" type="uint32"/>
<param default="3" id="2" name="numCh_" type="uint32"/>
<param default="1" id="3" name="chMask_" type="uint32"/>
@ -59,7 +59,7 @@
</struct>
</module>
<module id="8" name="Multi Band DRC">
<param default="1" id="0" max="3" name="opMode_" type="uint32"/>
<param default="0" id="0" max="3" name="opMode_" type="uint32"/>
<param default="48000" id="1" name="fs_" type="uint32"/>
<param default="2" id="2" name="numCh_" type="uint32"/>
<param default="3" id="3" name="chMask_" type="uint32"/>
@ -108,8 +108,8 @@
<struct id="18">
<param max="30" min="-30" name="limiter_gain_dB" type="float"/>
<param max="0" min="-30" name="limiter_threadhold_dB" type="float"/>
<param max="100" min="0" name="limiter_attackTime_ms" type="uint32"/>
<param max="100" min="0" name="limiter_releaseTime_ms" type="uint32"/>
<param max="100" min="0" name="limiter_attackTime_ms" type="float"/>
<param max="100" min="0" name="limiter_releaseTime_ms" type="float"/>
</struct>
<struct id="19">
<param name="frequency0" type="uint32"/>
@ -117,7 +117,7 @@
</struct>
</module>
<module id="11" name="Stationary Noise Suppression">
<param default="1" id="0" max="3" name="opMode_" type="uint32"/>
<param default="0" id="0" max="3" name="opMode_" type="uint32"/>
<param default="48000" id="1" name="fs_" type="uint32"/>
<param default="2" id="2" name="numCh_" type="uint32"/>
<param default="3" id="3" name="chMask_" type="uint32"/>
@ -130,14 +130,14 @@
<param id="22" name="RELEASE_TIME" type="float"/>
</module>
<module id="14" name="Linear Gain">
<param default="1" id="0" max="3" name="opMode_" type="uint32"/>
<param default="0" id="0" max="3" name="opMode_" type="uint32"/>
<param default="48000" id="1" name="fs_" type="uint32"/>
<param default="1" id="2" name="numCh_" type="uint32"/>
<param default="1" id="3" name="chMask_" type="uint32"/>
<param id="16" name="Simple_gain" type="float"/>
</module>
<module id="17" name="Wind Noise Reduction">
<param default="1" id="0" max="3" name="opMode_" type="uint32"/>
<param default="0" id="0" max="3" name="opMode_" type="uint32"/>
<param default="48000" id="1" name="fs_" type="uint32"/>
<param default="2" id="2" name="numCh_" type="uint32"/>
<param default="3" id="3" name="chMask_" type="uint32"/>
@ -201,7 +201,7 @@
<param default="1000" id="73" name="GAIN_BOOSTING_COST" type="int32"/>
</module>
<module id="18" name="Multi Channel IIR 1">
<param default="1" id="0" max="3" name="opMode_" type="uint32"/>
<param default="0" id="0" max="3" name="opMode_" type="uint32"/>
<param default="48000" id="1" name="fs_" type="uint32"/>
<param default="2" id="2" name="numCh_" type="uint32"/>
<param default="3" id="3" name="chMask_" type="uint32"/>

View file

@ -353,6 +353,7 @@
<path value="84" id="device_in_unprocessed_usb_4_pin_headset_mic" mixer-ref="usb_headset_mic" />
<path value="85" id="device_in_bt_sco_mic" mixer-ref="bt_mic" />
<!--
Mixer
-->