Merge "audio: enable apmg3 feature" into udc-qpr-dev

This commit is contained in:
Carter Hsu 2023-08-25 07:05:20 +00:00 committed by Android (Google) Code Review
commit bfbcf919df
2 changed files with 14 additions and 2 deletions

View file

@ -199,7 +199,7 @@
<usecase id="UC_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/> <usecase id="UC_AUDIO_RECORD" dev1="8" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
<usecase id="UC_HOSTLESS_UL" dev1="15"/> <usecase id="UC_HOSTLESS_UL" dev1="15"/>
<!-- for VOIP input, 4 * 10ms buffer --> <!-- for VOIP input, 4 * 10ms buffer -->
<usecase id="UC_VOIP_RECORD" dev1="17" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="2"/> <usecase id="UC_VOIP_RECORD" dev1="20" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="2" pcm_ch="4"/>
<!-- for input wit AUDIO_INPUT_FLAG_FAST 480 periods * 1ms buffer, 16-bit, 2ch, buffer size 92160 bytes--> <!-- for input wit AUDIO_INPUT_FLAG_FAST 480 periods * 1ms buffer, 16-bit, 2ch, buffer size 92160 bytes-->
<usecase id="UC_LOW_LATENCY_AUDIO_RECORD" dev1="10" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="480"/> <usecase id="UC_LOW_LATENCY_AUDIO_RECORD" dev1="10" dyn_path="true" dsp_vol="false" mmap="true" period="1" period_num="480"/>
<!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 240 periods * 1ms buffer, 32-bit,2 ch, buffer size 92160 bytes --> <!-- for input wit AUDIO_INPUT_FLAG_MMAP_NOIRQ 240 periods * 1ms buffer, 32-bit,2 ch, buffer size 92160 bytes -->
@ -245,10 +245,15 @@
</usecase> </usecase>
</dsp_latency> </dsp_latency>
<usecase_effect>
<usecase id="UC_VOIP_RECORD" effect_lib="audio_speech_enhancer_aoc.so"/>
</usecase_effect>
<soundcard_name name="google,aoc-snd-card" /> <soundcard_name name="google,aoc-snd-card" />
<features> <features>
<feature name="SoundTriggerDockTuning"/> <feature name="SoundTriggerDockTuning"/>
<feature name="BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL,Strategy:WholeSpeaker"/> <feature name="BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL,Strategy:WholeSpeaker"/>
<feature name="Apmg3"/>
</features> </features>
<cfg_attr> <cfg_attr>
@ -303,9 +308,13 @@
<external_module> <external_module>
<module libname="audio_waves_aoc.so" argu="Sink=SPK:1,USB_DOCK:4,USB_HP:4 Extensions=StereoSpatializer"/> <module libname="audio_waves_aoc.so" argu="Sink=SPK:1,USB_DOCK:4,USB_HP:4 Extensions=StereoSpatializer"/>
<module libname="audio_spk_35l41.so" argu="SpeakerNum=4,Rotation"/> <module libname="audio_spk_35l41.so" argu="SpeakerNum=4,Rotation"/>
<module libname="audio_fortemedia_aoc.so" argu="RTN_SUP=y DOCK_CHARGER_MONITOR=y DL_CH=y VoIP_DLCHs=SPK:2,USB:2 VoIP_Rate=32000"/>
<module libname="liboffloadeffect.so"/> <module libname="liboffloadeffect.so"/>
<module libname="audio_amcs_ext.so" argu="SpeakerNum=4" /> <module libname="audio_amcs_ext.so" argu="SpeakerNum=4" />
<module libname="audio_bluenote_aoc.so"/> <module libname="audio_bluenote_aoc.so"/>
<module libname="audio_apmg3_aoc.so"/>
</external_module> </external_module>
<hal_effect>
<module libname="audio_speech_enhancer_aoc.so"/>
</hal_effect>
</audio_platform_configuration> </audio_platform_configuration>

View file

@ -610,14 +610,17 @@
</path> </path>
<path name="voip-recordC"> <path name="voip-recordC">
<ctl name="Incall Capture Stream0" value="3MIC"/>
<ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1"/> <ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1"/>
</path> </path>
<path name="voip-recordC usb-headset-mic"> <path name="voip-recordC usb-headset-mic">
<ctl name="Incall Capture Stream0" value="3MIC"/>
<ctl name="VOIP TX Mixer USB_TX" value="1"/> <ctl name="VOIP TX Mixer USB_TX" value="1"/>
</path> </path>
<path name="voip-recordC bt-mic"> <path name="voip-recordC bt-mic">
<ctl name="Incall Capture Stream0" value="3MIC"/>
<ctl name="VOIP TX Mixer BT_TX" value="1"/> <ctl name="VOIP TX Mixer BT_TX" value="1"/>
</path> </path>