Evolution-X-Tensor/device_google_shusky
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Snap for 12361654 from 736fcf07f4 to 24Q4-release

Browse source 
Change-Id: I305d43f38e07391a237a403086897101e795b01d
This commit is contained in:
Android Build Coastguard Worker 2024-09-12 23:02:42 +00:00
commit 9f7077d928
18 changed files with 500 additions and 454 deletions
Download patch file Download diff file Expand all files Collapse all files

19
audio/husky/aidl_config/audio_platform_configuration.xml
View file

@ -24,10 +24,13 @@
<argument name="PollWaitMs" value="20000" />
<argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
<argument name="ThermistorType" value="UNKNOWN" />
<argument name="ThrottlingSeverity" value="MODERATE" />
<argument name="ThrottlingSeverity" value="LIGHT" />
</feature>
<feature name="RuntimeTuningDump" />
<!-- <feature name="spatializer-offload" /> -->
<feature name="SoundDose">
<argument name="Curves" value="blackbird,condor=0,46.35,0.1950549451;54.6,57,0.98625" />
</feature>
<feature name="spatializer-offload" />
</features>
<voipVolume>
@ -47,7 +50,6 @@
<device name="usb" />
<device name="speaker" codec="cs35l41">
<argument name="SpeakerNum" value="2" />
<argument name="Rotation" />
<argument name="AcousticShockProtection" />
</device>
</devices>
@ -58,11 +60,12 @@
<argument name="ThermistorsName" value="VIRTUAL-SKIN-SPEAKER" />
</tuner>
<tuner type="telephony" name="fortemedia">
<argument name="VoIP_DLCHs" value="SPK:2,USB:2" />
<argument name="VoIP_DLCHs" value="SPK:2,USB:2,BT:2" />
<argument name="VoIP_Rate" value="32000" />
<argument name="BOOST_USB_SWB_CLK" value="y" />
<argument name="BOOST_HANDSET_SWB_CLK" value="y" />
<argument name="CCA" value="UnsupportBands:48000,ExSharedBands:48000,VoIPMode:Dl" />
<argument name="MCPS_TABLE" value="y" />
</tuner>
<tuner type="capture" name="gs_capture" />
</tuners>
@ -71,8 +74,8 @@
<latency source="primary-playback" sink="speaker" milliseconds="20" />
<latency source="primary-playback" sink="usb-device" milliseconds="10" />
<latency source="primary-playback" sink="usb-headset" milliseconds="10" />
<latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="10" />
<latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="10" />
<latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
<latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="100" />
<latency source="deep-buffer-playback" sink="speaker" milliseconds="70" />
<latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" />
@ -89,18 +92,18 @@
<latency source="microphones" sink="primary-capture" milliseconds="160" />
<latency source="back-microphones" sink="primary-capture" milliseconds="160" />
<latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="40" />
<latency source="usb-device-microphones" sink="primary-capture" milliseconds="100" />
<latency source="usb-headset-microphones" sink="primary-capture" milliseconds="100" />
</latencies>
<spatialCapture>
<enablement useCase="primary-capture" deviceInterface="microphones">
<source>MIC</source>
<source>CAMCORDER</source>
<source>VOICE_RECOGNITION</source>
</enablement>
<enablement useCase="primary-capture" deviceInterface="back-microphones">
<source>MIC</source>
<source>CAMCORDER</source>
<source>VOICE_RECOGNITION</source>
</enablement>
</spatialCapture>

424
audio/husky/aidl_config/mixer_paths_aidl.xml
View file

@ -256,10 +256,14 @@
<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" />
<ctl name="Hotword Tap Enable" value="0" />
<!-- In AIDL Hal, this controlled by audio hal directly to avoid aoc" -->
<!-- crashing since speicifc order is needed between dsp mode and" -->
<!-- spatial module." -->
<ctl name="Mic Spatial Module Enable" value="0" />
<!-- audio PDM mic default state -->
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1" />
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
@ -307,6 +311,7 @@
<ctl name="Incall Capture Stream0" value="Off" />
<ctl name="Incall Capture Stream1" value="Off" />
<ctl name="Incall Capture Stream2" value="Off" />
<ctl name="Incall Capture Stream3" value="Off" />
<!-- These two controls control the muting function of mics and sinks during the voice call. -->
<!-- They would be enabled by HAL. -->
@ -413,6 +418,10 @@
<path name="primary-playback -> bt" />
</path>
<path name="primary-playback-0 -> bluetooth-low-energy-broadcast">
<path name="primary-playback -> bt" />
</path>
<path name="primary-playback-0 -> usb">
<ctl name="USB_RX Mixer EP2" value="1" />
</path>
@ -485,6 +494,10 @@
<path name="raw-playback -> bt" />
</path>
<path name="raw-playback-0 -> bluetooth-low-energy-broadcast">
<path name="raw-playback -> bt" />
</path>
<path name="raw-playback-0 -> usb">
<ctl name="USB_RX Mixer RAW" value="1" />
</path>
@ -557,6 +570,10 @@
<path name="deep-buffer-playback -> bt" />
</path>
<path name="deep-buffer-playback-0 -> bluetooth-low-energy-broadcast">
<path name="deep-buffer-playback -> bt" />
</path>
<path name="deep-buffer-playback-0 -> usb">
<ctl name="USB_RX Mixer EP6" value="1" />
</path>
@ -634,6 +651,10 @@
<path name="compress-offload-playback -> bt" />
</path>
<path name="compress-offload-playback-0 -> bluetooth-low-energy-broadcast">
<path name="compress-offload-playback -> bt" />
</path>
<path name="compress-offload-playback-0 -> usb">
<ctl name="USB_RX Mixer EP7" value="1" />
</path>
@ -706,6 +727,10 @@
<path name="mmap-playback -> bt" />
</path>
<path name="mmap-playback-0 -> bluetooth-low-energy-broadcast">
<path name="mmap-playback -> bt" />
</path>
<path name="mmap-playback-0 -> usb">
<ctl name="USB_RX Mixer EP1" value="1" />
</path>
@ -790,6 +815,10 @@
<path name="voip-playback -> bt" />
</path>
<path name="voip-playback-0 -> bluetooth-low-energy-broadcast">
<path name="voip-playback -> bt" />
</path>
<path name="voip-playback-0 -> usb">
<ctl name="USB_RX Mixer VOIP" value="1" />
</path>
@ -806,61 +835,6 @@
<path name="voip-playback-0 -> usb" />
</path>
<path name="immersive-playback -> speaker">
<ctl name="TDM_0_RX Mixer IMSV" value="1" />
</path>
<path name="immersive-playback-0 -> speaker">
<path name="immersive-playback -> speaker" />
</path>
<path name="immersive-playback-0 -> speaker-earpiece">
<path name="immersive-playback -> speaker" />
</path>
<path name="immersive-playback-0 -> speaker-safe">
<path name="immersive-playback -> speaker" />
</path>
<path name="immersive-playback -> bt">
<ctl name="BT_RX Mixer IMSV" value="1" />
</path>
<path name="immersive-playback-0 -> bt">
<path name="immersive-playback -> bt" />
</path>
<path name="immersive-playback-0 -> bluetooth-a2dp-device">
<path name="immersive-playback -> bt" />
</path>
<path name="immersive-playback-0 -> bluetooth-a2dp-headphone">
<path name="immersive-playback -> bt" />
</path>
<path name="immersive-playback-0 -> bluetooth-a2dp-speaker">
<path name="immersive-playback -> bt" />
</path>
<path name="immersive-playback-0 -> bluetooth-low-energy-headset">
<path name="immersive-playback -> bt" />
</path>
<path name="immersive-playback-0 -> bluetooth-low-energy-speaker">
<path name="immersive-playback -> bt" />
</path>
<path name="immersive-playback-0 -> usb">
<ctl name="USB_RX Mixer IMSV" value="1" />
</path>
<path name="immersive-playback-0 -> usb-headset">
<path name="immersive-playback-0 -> usb" />
</path>
<path name="immersive-playback-0 -> usb-device">
<path name="immersive-playback-0 -> usb" />
</path>
<path name="spatializer-offload-playback -> speaker">
<ctl name="TDM_0_RX Mixer EP4" value="1" />
@ -882,6 +856,18 @@
<ctl name="BT_RX Mixer EP4" value="1" />
</path>
<path name="spatializer-offload-playback-0 -> bluetooth-sco-default">
<path name="spatializer-offload-playback -> bt" />
</path>
<path name="spatializer-offload-playback-0 -> bluetooth-sco-headset">
<path name="spatializer-offload-playback -> bt" />
</path>
<path name="spatializer-offload-playback-0 -> bluetooth-sco-car-kit">
<path name="spatializer-offload-playback -> bt" />
</path>
<path name="spatializer-offload-playback-0 -> bluetooth-a2dp-device">
<path name="spatializer-offload-playback -> bt" />
</path>
@ -902,6 +888,10 @@
<path name="spatializer-offload-playback -> bt" />
</path>
<path name="spatializer-offload-playback-0 -> bluetooth-low-energy-broadcast">
<path name="spatializer-offload-playback -> bt" />
</path>
<path name="spatializer-offload-playback-0 -> usb">
<ctl name="USB_RX Mixer EP4" value="1" />
</path>
@ -972,6 +962,10 @@
<path name="haptic-playback -> bt" />
</path>
<path name="haptic-playback-0 -> bluetooth-low-energy-broadcast">
<path name="haptic-playback -> bt" />
</path>
<path name="haptic-playback-0 -> usb">
<ctl name="USB_RX Mixer EP3" value="1" />
<ctl name="TDM_0_RX Mixer EP8" value="1" />
@ -1046,6 +1040,39 @@
<ctl name="VOIP TX Mixer BT_TX" value="1" />
</path>
<path name="microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
</path>
<path name="back-microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
</path>
<path name="usb-microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer USB_TX" value="1" />
</path>
<path name="usb-headset-microphones -> voip-gsenet-capture-0">
<path name="usb-microphones -> voip-gsenet-capture-0" />
</path>
<path name="usb-device-microphones -> voip-gsenet-capture-0">
<path name="usb-microphones -> voip-gsenet-capture-0" />
</path>
<path name="bluetooth-sco-headset-microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer BT_TX" value="1" />
</path>
<path name="bluetooth-low-energy-headset-microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer BT_TX" value="1" />
</path>
<path name="microphones -> fast-capture-0">
<ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
</path>
@ -1074,11 +1101,47 @@
<ctl name="EP3 TX Mixer BT_TX" value="1" />
</path>
<path name="microphones -> sound-trigger-capture-0" />
<path name="sound-trigger-microphones -> sound-trigger-capture-0" />
<path name="microphones -> sound-trigger-tap-capture-0" />
<path name="sound-trigger-microphones -> sound-trigger-tap-capture-0">
<ctl name="Audio Capture Eraser Enable" value="1" />
<ctl name="Hotword Tap Enable" value="1" />
<ctl name="MIC Record Soft Gain (dB)" value="0" />
</path>
<path name="microphones -> hotword-lookback-capture-0" />
<path name="sound-trigger-microphones -> hotword-lookback-capture-0" />
<path name="ultrasound-microphones -> ultrasound-capture-0">
<ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="1" />
</path>
<path name="microphones -> mmap-capture-0">
<ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
</path>
<path name="back-microphones -> mmap-capture-0">
<path name="microphones -> mmap-capture-0" />
</path>
<path name="usb-microphones -> mmap-capture-0">
<ctl name="EP2 TX Mixer USB_TX" value="1" />
</path>
<path name="usb-headset-microphones -> mmap-capture-0">
<path name="usb-microphones -> mmap-capture-0" />
</path>
<path name="usb-device-microphones -> mmap-capture-0">
<path name="usb-microphones -> mmap-capture-0" />
</path>
<path name="bluetooth-sco-headset-microphones -> mmap-capture-0">
<ctl name="EP2 TX Mixer BT_TX" value="1" />
</path>
<path name="bluetooth-low-energy-headset-microphones -> mmap-capture-0">
<ctl name="EP2 TX Mixer BT_TX" value="1" />
</path>
<!-- voice-call dynamic route -->
<path name="voice-call-downlink-0 -> speaker">
@ -1113,6 +1176,10 @@
<path name="voice-call-downlink-0 -> bt" />
</path>
<path name="voice-call-downlink-0 -> bluetooth-low-energy-broadcast">
<path name="voice-call-downlink-0 -> bt" />
</path>
<path name="voice-call-downlink-0 -> usb">
<ctl name="USB_RX Mixer EP5" value="1" />
</path>
@ -1165,77 +1232,9 @@
<ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
</path>
<path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-0">
<ctl name="Incall Capture Stream0" value="DL" />
</path>
<path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-0">
<ctl name="Incall Capture Stream0" value="UL" />
</path>
<path name="telephony-rx (VOICE_CALL) -> in-call-capture-0">
<ctl name="Incall Capture Stream0" value="UL_DL" />
</path>
<path name="telephony-rx (MIC) -> in-call-capture-0">
<ctl name="Incall Capture Stream0" value="DL" />
</path>
<path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-1">
<ctl name="Incall Capture Stream1" value="DL" />
</path>
<path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-1">
<ctl name="Incall Capture Stream1" value="UL" />
</path>
<path name="telephony-rx (VOICE_CALL) -> in-call-capture-1">
<ctl name="Incall Capture Stream1" value="UL_DL" />
</path>
<path name="telephony-rx (MIC) -> in-call-capture-1">
<ctl name="Incall Capture Stream1" value="DL" />
</path>
<path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="DL" />
</path>
<path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="UL" />
</path>
<path name="telephony-rx (VOICE_CALL) -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="UL_DL" />
</path>
<path name="telephony-rx (MIC) -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="DL" />
</path>
<path name="microphones -> mmap-capture-0">
<ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
</path>
<path name="usb-microphones -> mmap-capture-0">
<ctl name="EP2 TX Mixer USB_TX" value="1" />
</path>
<path name="usb-headset-microphones -> mmap-capture-0">
<path name="usb-microphones -> mmap-capture-0" />
</path>
<path name="usb-device-microphones -> mmap-capture-0">
<path name="usb-microphones -> mmap-capture-0" />
</path>
<path name="bluetooth-sco-headset-microphones -> mmap-capture-0">
<ctl name="EP2 TX Mixer BT_TX" value="1" />
</path>
<path name="bluetooth-low-energy-headset-microphones -> mmap-capture-0">
<ctl name="EP2 TX Mixer BT_TX" value="1" />
</path>
<path name="in-call-capture-source-0 -> in-call-capture-0" />
<path name="in-call-capture-source-1 -> in-call-capture-1" />
<path name="in-call-capture-source-2 -> in-call-capture-2" />
<!-- codec setting -->
<!-- Rx device -->
@ -1249,7 +1248,6 @@
<ctl name="PCM Source" value="ASP" />
<ctl name="AMP PCM Gain" value="7" />
<ctl name="Main AMP Enable Switch" value="1" />
<ctl name="AoC Chirp Enable" value="1" />
</path>
<path name="speaker">
@ -1266,7 +1264,6 @@
<ctl name="R ASPTX1 Slot Position" value="0" />
<ctl name="R Main AMP Enable Switch" value="1" />
<ctl name="Main AMP Enable Switch" value="1" />
<!-- load Enable FIR -->
<ctl name="Fast Use Case Delta File" value="fast_switch1.txt" />
<ctl name="Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Delta File" value="fast_switch2.txt" />
@ -1275,36 +1272,35 @@
<path name="speaker-safe">
<ctl name="R Main AMP Enable Switch" value="1" />
<!-- load Bypass FIR -->
<ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" />
</path>
<!-- Tx device -->
<path name="microphones">
<path name="builtin-mic-id-capture-list">
<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="1" value="1" />
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
</path>
<path name="microphones">
<path name="builtin-mic-id-capture-list" />
<ctl name="MIC DC Blocker" value="1" />
<ctl name="MIC Record Soft Gain (dB)" value="22" />
</path>
<path name="microphones (VOICE)">
<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" />
<path name="builtin-mic-id-capture-list" />
<ctl name="MIC DC Blocker" value="1" />
<ctl name="MIC HW Gain At High Power Mode (cB)" value="130" />
<ctl name="MIC Record Soft Gain (dB)" value="0" />
</path>
<path name="microphones (VOICE_COMMUNICATION,VOICE)">
<path name="microphones (VOICE)" />
</path>
<path name="microphones (VOICE_RECOGNITION)">
<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" />
<path name="builtin-mic-id-capture-list" />
<ctl name="MIC DC Blocker" value="1" />
<ctl name="MIC Record Soft Gain (dB)" value="22" />
</path>
@ -1316,91 +1312,47 @@
</path>
<path name="microphones (SOUND_TRIGGER_AEC)">
<ctl name="Audio Capture Eraser 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" />
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
<path name="builtin-mic-id-capture-list" />
<ctl name="MIC DC Blocker" value="1" />
<ctl name="Audio Capture Eraser Enable" value="1" />
<ctl name="Audio Capture Mic Source" value="ERASER" />
<ctl name="MIC Record Soft Gain (dB)" value="0" />
</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" />
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
<path name="microphones (CAMCORDER)">
<path name="builtin-mic-id-capture-list" />
<ctl name="MIC DC Blocker" value="1" />
<ctl name="MIC Record Soft Gain (dB)" value="22" />
<ctl name="MIC Record Soft Gain (dB)" value="0" />
</path>
<path name="microphones (UNPROCESSED)">
<path name="builtin-mic-id-capture-list" />
<ctl name="MIC DC Blocker" value="1" />
<ctl name="MIC Record Soft Gain (dB)" value="5" />
</path>
<path name="back-microphones">
<path name="microphones" />
</path>
<path name="back-microphones (VOICE)">
<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 HW Gain At High Power Mode (cB)" value="130" />
<ctl name="MIC Record Soft Gain (dB)" value="0" />
<path name="microphones (VOICE)" />
</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 name="back-microphones (VOICE_COMMUNICATION,VOICE)">
<path name="back-microphones (VOICE)" />
</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" />
<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="unprocessed-mic">
<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="5" />
</path>
<path name="unprocessed-dual-mic">
<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="5" />
</path>
<path name="unprocessed-triple-mic">
<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="5" />
<path name="back-microphones (UNPROCESSED)">
<path name="microphones (UNPROCESSED)" />
</path>
<path name="bluetooth-sco-headset-microphones">
<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" />
<path name="builtin-mic-id-capture-list" />
<ctl name="Audio Capture Mic Source" value="BT_MIC" />
<ctl name="Voice Call Mic Source" value="BT_MIC" />
<ctl name="MIC Record Soft Gain (dB)" value="0" />
@ -1411,9 +1363,7 @@
</path>
<path name="usb-microphones">
<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" />
<path name="builtin-mic-id-capture-list" />
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
<ctl name="Audio Capture Mic Source" value="USB_MIC" />
<ctl name="Voice Call Mic Source" value="USB_MIC" />
@ -1428,6 +1378,54 @@
<path name="usb-microphones" />
</path>
<path name="in-call-capture-source-0 (VOICE_DOWNLINK)">
<ctl name="Incall Capture Stream0" value="DL" />
</path>
<path name="in-call-capture-source-0 (VOICE_UPLINK)">
<ctl name="Incall Capture Stream0" value="UL" />
</path>
<path name="in-call-capture-source-0 (VOICE_CALL)">
<ctl name="Incall Capture Stream0" value="UL_DL" />
</path>
<path name="in-call-capture-source-0">
<path name="in-call-capture-source-0 (VOICE_DOWNLINK)" />
</path>
<path name="in-call-capture-source-1 (VOICE_DOWNLINK)">
<ctl name="Incall Capture Stream1" value="DL" />
</path>
<path name="in-call-capture-source-1 (VOICE_UPLINK)">
<ctl name="Incall Capture Stream1" value="UL" />
</path>
<path name="in-call-capture-source-1 (VOICE_CALL)">
<ctl name="Incall Capture Stream1" value="UL_DL" />
</path>
<path name="in-call-capture-source-1">
<path name="in-call-capture-source-1 (VOICE_DOWNLINK)" />
</path>
<path name="in-call-capture-source-2 (VOICE_DOWNLINK)">
<ctl name="Incall Capture Stream2" value="DL" />
</path>
<path name="in-call-capture-source-2 (VOICE_UPLINK)">
<ctl name="Incall Capture Stream2" value="UL" />
</path>
<path name="in-call-capture-source-2 (VOICE_CALL)">
<ctl name="Incall Capture Stream2" value="UL_DL" />
</path>
<path name="in-call-capture-source-2">
<path name="in-call-capture-source-2 (VOICE_DOWNLINK)" />
</path>
<!-- cs35l41 specific path to load firmware in cs35l41.c -->
<path name="cs35l41-load-protection-firmware-start">
<!-- Enable it after get the protection firmware -->

10
audio/husky/audio-tables.mk
View file

@ -82,3 +82,13 @@ PRODUCT_COPY_FILES += \
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/test_preset.mps
endif
ifeq ($(USE_AUDIO_HAL_AIDL),true)
# Offload spatializer config
PRODUCT_COPY_FILES += \
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/base:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/base \
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_2_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_2_ch \
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_6_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_6_ch \
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_xaural:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_xaural \
endif

4
audio/husky/config/audio_platform_configuration.xml
View file

@ -173,8 +173,8 @@
</input_backend_cfg_mic_mapping>
<usecase_attr>
<!-- for output with AUDIO_OUTPUT_FLAG_RAW, 32 periods * 64 frames(around 1.3ms) * 2ch * 4(s32) = 16384 bytes -->
<usecase id="UC_RAW_PLAYBACK" dev1="23" dyn_path="true" dsp_vol="false" mmap="true" period="64" period_num="32"/>
<!-- for output with AUDIO_OUTPUT_FLAG_RAW, 40 periods * 48 frames/period * 2ch * 4(s32) = 15360 bytes -->
<usecase id="UC_RAW_PLAYBACK" dev1="23" dyn_path="true" dsp_vol="false" mmap="false" period="48" period_num="40"/>
<!-- for output with AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST, 4 * 10ms buffer -->
<usecase id="UC_LOW_LATENCY_PLAYBACK" dev1="1" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
<!-- for output with AUDIO_OUTPUT_FLAG_MMAP_NOIRQ, 40 periods * 48 frames/period(=1ms w/ 48k sample rate) * 2ch *4(float) = 15360 bytes -->

BIN
audio/husky/tuning/spatializer/base Normal file
View file

Binary file not shown.

BIN
audio/husky/tuning/spatializer/mode_2_ch Normal file
View file

Binary file not shown.

BIN
audio/husky/tuning/spatializer/mode_6_ch Normal file
View file

Binary file not shown.

BIN
audio/husky/tuning/spatializer/mode_xaural Normal file
View file

Binary file not shown.

19
audio/shiba/aidl_config/audio_platform_configuration.xml
View file

@ -24,10 +24,13 @@
<argument name="PollWaitMs" value="20000" />
<argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
<argument name="ThermistorType" value="UNKNOWN" />
<argument name="ThrottlingSeverity" value="MODERATE" />
<argument name="ThrottlingSeverity" value="LIGHT" />
</feature>
<feature name="RuntimeTuningDump" />
<!-- <feature name="spatializer-offload" /> -->
<feature name="SoundDose">
<argument name="Curves" value="blackbird,condor=0,46.35,0.1950549451;54.6,57,0.98625" />
</feature>
<feature name="spatializer-offload" />
</features>
<voipVolume>
@ -47,7 +50,6 @@
<device name="usb" />
<device name="speaker" codec="cs35l41">
<argument name="SpeakerNum" value="2" />
<argument name="Rotation" />
<argument name="AcousticShockProtection" />
</device>
</devices>
@ -58,11 +60,12 @@
<argument name="ThermistorsName" value="VIRTUAL-SKIN-SPEAKER" />
</tuner>
<tuner type="telephony" name="fortemedia">
<argument name="VoIP_DLCHs" value="SPK:2,USB:2" />
<argument name="VoIP_DLCHs" value="SPK:2,USB:2,BT:2" />
<argument name="VoIP_Rate" value="32000" />
<argument name="BOOST_USB_SWB_CLK" value="y" />
<argument name="BOOST_HANDSET_SWB_CLK" value="y" />
<argument name="CCA" value="UnsupportBands:48000,ExSharedBands:48000,VoIPMode:Dl" />
<argument name="MCPS_TABLE" value="y" />
</tuner>
<tuner type="capture" name="gs_capture" />
</tuners>
@ -71,8 +74,8 @@
<latency source="primary-playback" sink="speaker" milliseconds="20" />
<latency source="primary-playback" sink="usb-device" milliseconds="10" />
<latency source="primary-playback" sink="usb-headset" milliseconds="10" />
<latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="10" />
<latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="10" />
<latency source="primary-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
<latency source="primary-playback" sink="bluetooth-low-energy-speaker" milliseconds="100" />
<latency source="deep-buffer-playback" sink="speaker" milliseconds="70" />
<latency source="deep-buffer-playback" sink="usb-device" milliseconds="70" />
@ -89,18 +92,18 @@
<latency source="microphones" sink="primary-capture" milliseconds="160" />
<latency source="back-microphones" sink="primary-capture" milliseconds="160" />
<latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="40" />
<latency source="usb-device-microphones" sink="primary-capture" milliseconds="100" />
<latency source="usb-headset-microphones" sink="primary-capture" milliseconds="100" />
</latencies>
<spatialCapture>
<enablement useCase="primary-capture" deviceInterface="microphones">
<source>MIC</source>
<source>CAMCORDER</source>
<source>VOICE_RECOGNITION</source>
</enablement>
<enablement useCase="primary-capture" deviceInterface="back-microphones">
<source>MIC</source>
<source>CAMCORDER</source>
<source>VOICE_RECOGNITION</source>
</enablement>
</spatialCapture>

424
audio/shiba/aidl_config/mixer_paths_aidl.xml
View file

@ -256,10 +256,14 @@
<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" />
<ctl name="Hotword Tap Enable" value="0" />
<!-- In AIDL Hal, this controlled by audio hal directly to avoid aoc" -->
<!-- crashing since speicifc order is needed between dsp mode and" -->
<!-- spatial module." -->
<ctl name="Mic Spatial Module Enable" value="0" />
<!-- audio PDM mic default state -->
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="0" value="-1" />
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="1" value="-1" />
@ -307,6 +311,7 @@
<ctl name="Incall Capture Stream0" value="Off" />
<ctl name="Incall Capture Stream1" value="Off" />
<ctl name="Incall Capture Stream2" value="Off" />
<ctl name="Incall Capture Stream3" value="Off" />
<!-- These two controls control the muting function of mics and sinks during the voice call. -->
<!-- They would be enabled by HAL. -->
@ -413,6 +418,10 @@
<path name="primary-playback -> bt" />
</path>
<path name="primary-playback-0 -> bluetooth-low-energy-broadcast">
<path name="primary-playback -> bt" />
</path>
<path name="primary-playback-0 -> usb">
<ctl name="USB_RX Mixer EP2" value="1" />
</path>
@ -485,6 +494,10 @@
<path name="raw-playback -> bt" />
</path>
<path name="raw-playback-0 -> bluetooth-low-energy-broadcast">
<path name="raw-playback -> bt" />
</path>
<path name="raw-playback-0 -> usb">
<ctl name="USB_RX Mixer RAW" value="1" />
</path>
@ -557,6 +570,10 @@
<path name="deep-buffer-playback -> bt" />
</path>
<path name="deep-buffer-playback-0 -> bluetooth-low-energy-broadcast">
<path name="deep-buffer-playback -> bt" />
</path>
<path name="deep-buffer-playback-0 -> usb">
<ctl name="USB_RX Mixer EP6" value="1" />
</path>
@ -634,6 +651,10 @@
<path name="compress-offload-playback -> bt" />
</path>
<path name="compress-offload-playback-0 -> bluetooth-low-energy-broadcast">
<path name="compress-offload-playback -> bt" />
</path>
<path name="compress-offload-playback-0 -> usb">
<ctl name="USB_RX Mixer EP7" value="1" />
</path>
@ -706,6 +727,10 @@
<path name="mmap-playback -> bt" />
</path>
<path name="mmap-playback-0 -> bluetooth-low-energy-broadcast">
<path name="mmap-playback -> bt" />
</path>
<path name="mmap-playback-0 -> usb">
<ctl name="USB_RX Mixer EP1" value="1" />
</path>
@ -790,6 +815,10 @@
<path name="voip-playback -> bt" />
</path>
<path name="voip-playback-0 -> bluetooth-low-energy-broadcast">
<path name="voip-playback -> bt" />
</path>
<path name="voip-playback-0 -> usb">
<ctl name="USB_RX Mixer VOIP" value="1" />
</path>
@ -806,61 +835,6 @@
<path name="voip-playback-0 -> usb" />
</path>
<path name="immersive-playback -> speaker">
<ctl name="TDM_0_RX Mixer IMSV" value="1" />
</path>
<path name="immersive-playback-0 -> speaker">
<path name="immersive-playback -> speaker" />
</path>
<path name="immersive-playback-0 -> speaker-earpiece">
<path name="immersive-playback -> speaker" />
</path>
<path name="immersive-playback-0 -> speaker-safe">
<path name="immersive-playback -> speaker" />
</path>
<path name="immersive-playback -> bt">
<ctl name="BT_RX Mixer IMSV" value="1" />
</path>
<path name="immersive-playback-0 -> bt">
<path name="immersive-playback -> bt" />
</path>
<path name="immersive-playback-0 -> bluetooth-a2dp-device">
<path name="immersive-playback -> bt" />
</path>
<path name="immersive-playback-0 -> bluetooth-a2dp-headphone">
<path name="immersive-playback -> bt" />
</path>
<path name="immersive-playback-0 -> bluetooth-a2dp-speaker">
<path name="immersive-playback -> bt" />
</path>
<path name="immersive-playback-0 -> bluetooth-low-energy-headset">
<path name="immersive-playback -> bt" />
</path>
<path name="immersive-playback-0 -> bluetooth-low-energy-speaker">
<path name="immersive-playback -> bt" />
</path>
<path name="immersive-playback-0 -> usb">
<ctl name="USB_RX Mixer IMSV" value="1" />
</path>
<path name="immersive-playback-0 -> usb-headset">
<path name="immersive-playback-0 -> usb" />
</path>
<path name="immersive-playback-0 -> usb-device">
<path name="immersive-playback-0 -> usb" />
</path>
<path name="spatializer-offload-playback -> speaker">
<ctl name="TDM_0_RX Mixer EP4" value="1" />
@ -882,6 +856,18 @@
<ctl name="BT_RX Mixer EP4" value="1" />
</path>
<path name="spatializer-offload-playback-0 -> bluetooth-sco-default">
<path name="spatializer-offload-playback -> bt" />
</path>
<path name="spatializer-offload-playback-0 -> bluetooth-sco-headset">
<path name="spatializer-offload-playback -> bt" />
</path>
<path name="spatializer-offload-playback-0 -> bluetooth-sco-car-kit">
<path name="spatializer-offload-playback -> bt" />
</path>
<path name="spatializer-offload-playback-0 -> bluetooth-a2dp-device">
<path name="spatializer-offload-playback -> bt" />
</path>
@ -902,6 +888,10 @@
<path name="spatializer-offload-playback -> bt" />
</path>
<path name="spatializer-offload-playback-0 -> bluetooth-low-energy-broadcast">
<path name="spatializer-offload-playback -> bt" />
</path>
<path name="spatializer-offload-playback-0 -> usb">
<ctl name="USB_RX Mixer EP4" value="1" />
</path>
@ -972,6 +962,10 @@
<path name="haptic-playback -> bt" />
</path>
<path name="haptic-playback-0 -> bluetooth-low-energy-broadcast">
<path name="haptic-playback -> bt" />
</path>
<path name="haptic-playback-0 -> usb">
<ctl name="USB_RX Mixer EP3" value="1" />
<ctl name="TDM_0_RX Mixer EP8" value="1" />
@ -1046,6 +1040,39 @@
<ctl name="VOIP TX Mixer BT_TX" value="1" />
</path>
<path name="microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
</path>
<path name="back-microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer INTERNAL_MIC_TX" value="1" />
</path>
<path name="usb-microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer USB_TX" value="1" />
</path>
<path name="usb-headset-microphones -> voip-gsenet-capture-0">
<path name="usb-microphones -> voip-gsenet-capture-0" />
</path>
<path name="usb-device-microphones -> voip-gsenet-capture-0">
<path name="usb-microphones -> voip-gsenet-capture-0" />
</path>
<path name="bluetooth-sco-headset-microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer BT_TX" value="1" />
</path>
<path name="bluetooth-low-energy-headset-microphones -> voip-gsenet-capture-0">
<ctl name="Incall Capture Stream3" value="3MIC" />
<ctl name="VOIP TX Mixer BT_TX" value="1" />
</path>
<path name="microphones -> fast-capture-0">
<ctl name="EP3 TX Mixer INTERNAL_MIC_TX" value="1" />
</path>
@ -1074,11 +1101,47 @@
<ctl name="EP3 TX Mixer BT_TX" value="1" />
</path>
<path name="microphones -> sound-trigger-capture-0" />
<path name="sound-trigger-microphones -> sound-trigger-capture-0" />
<path name="microphones -> sound-trigger-tap-capture-0" />
<path name="sound-trigger-microphones -> sound-trigger-tap-capture-0">
<ctl name="Audio Capture Eraser Enable" value="1" />
<ctl name="Hotword Tap Enable" value="1" />
<ctl name="MIC Record Soft Gain (dB)" value="0" />
</path>
<path name="microphones -> hotword-lookback-capture-0" />
<path name="sound-trigger-microphones -> hotword-lookback-capture-0" />
<path name="ultrasound-microphones -> ultrasound-capture-0">
<ctl name="EP5 TX Mixer INTERNAL_MIC_US_TX" value="1" />
</path>
<path name="microphones -> mmap-capture-0">
<ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
</path>
<path name="back-microphones -> mmap-capture-0">
<path name="microphones -> mmap-capture-0" />
</path>
<path name="usb-microphones -> mmap-capture-0">
<ctl name="EP2 TX Mixer USB_TX" value="1" />
</path>
<path name="usb-headset-microphones -> mmap-capture-0">
<path name="usb-microphones -> mmap-capture-0" />
</path>
<path name="usb-device-microphones -> mmap-capture-0">
<path name="usb-microphones -> mmap-capture-0" />
</path>
<path name="bluetooth-sco-headset-microphones -> mmap-capture-0">
<ctl name="EP2 TX Mixer BT_TX" value="1" />
</path>
<path name="bluetooth-low-energy-headset-microphones -> mmap-capture-0">
<ctl name="EP2 TX Mixer BT_TX" value="1" />
</path>
<!-- voice-call dynamic route -->
<path name="voice-call-downlink-0 -> speaker">
@ -1113,6 +1176,10 @@
<path name="voice-call-downlink-0 -> bt" />
</path>
<path name="voice-call-downlink-0 -> bluetooth-low-energy-broadcast">
<path name="voice-call-downlink-0 -> bt" />
</path>
<path name="voice-call-downlink-0 -> usb">
<ctl name="USB_RX Mixer EP5" value="1" />
</path>
@ -1165,77 +1232,9 @@
<ctl name="NoHost1 TX Mixer TDM_0_TX" value="1" />
</path>
<path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-0">
<ctl name="Incall Capture Stream0" value="DL" />
</path>
<path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-0">
<ctl name="Incall Capture Stream0" value="UL" />
</path>
<path name="telephony-rx (VOICE_CALL) -> in-call-capture-0">
<ctl name="Incall Capture Stream0" value="UL_DL" />
</path>
<path name="telephony-rx (MIC) -> in-call-capture-0">
<ctl name="Incall Capture Stream0" value="DL" />
</path>
<path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-1">
<ctl name="Incall Capture Stream1" value="DL" />
</path>
<path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-1">
<ctl name="Incall Capture Stream1" value="UL" />
</path>
<path name="telephony-rx (VOICE_CALL) -> in-call-capture-1">
<ctl name="Incall Capture Stream1" value="UL_DL" />
</path>
<path name="telephony-rx (MIC) -> in-call-capture-1">
<ctl name="Incall Capture Stream1" value="DL" />
</path>
<path name="telephony-rx (VOICE_DOWNLINK) -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="DL" />
</path>
<path name="telephony-rx (VOICE_UPLINK) -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="UL" />
</path>
<path name="telephony-rx (VOICE_CALL) -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="UL_DL" />
</path>
<path name="telephony-rx (MIC) -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="DL" />
</path>
<path name="microphones -> mmap-capture-0">
<ctl name="EP2 TX Mixer INTERNAL_MIC_TX" value="1" />
</path>
<path name="usb-microphones -> mmap-capture-0">
<ctl name="EP2 TX Mixer USB_TX" value="1" />
</path>
<path name="usb-headset-microphones -> mmap-capture-0">
<path name="usb-microphones -> mmap-capture-0" />
</path>
<path name="usb-device-microphones -> mmap-capture-0">
<path name="usb-microphones -> mmap-capture-0" />
</path>
<path name="bluetooth-sco-headset-microphones -> mmap-capture-0">
<ctl name="EP2 TX Mixer BT_TX" value="1" />
</path>
<path name="bluetooth-low-energy-headset-microphones -> mmap-capture-0">
<ctl name="EP2 TX Mixer BT_TX" value="1" />
</path>
<path name="in-call-capture-source-0 -> in-call-capture-0" />
<path name="in-call-capture-source-1 -> in-call-capture-1" />
<path name="in-call-capture-source-2 -> in-call-capture-2" />
<!-- codec setting -->
<!-- Rx device -->
@ -1249,7 +1248,6 @@
<ctl name="PCM Source" value="ASP" />
<ctl name="AMP PCM Gain" value="7" />
<ctl name="Main AMP Enable Switch" value="1" />
<ctl name="AoC Chirp Enable" value="1" />
</path>
<path name="speaker">
@ -1266,7 +1264,6 @@
<ctl name="R ASPTX1 Slot Position" value="0" />
<ctl name="R Main AMP Enable Switch" value="1" />
<ctl name="Main AMP Enable Switch" value="1" />
<!-- load Enable FIR -->
<ctl name="Fast Use Case Delta File" value="fast_switch1.txt" />
<ctl name="Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Delta File" value="fast_switch2.txt" />
@ -1275,36 +1272,35 @@
<path name="speaker-safe">
<ctl name="R Main AMP Enable Switch" value="1" />
<!-- load Bypass FIR -->
<ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" />
</path>
<!-- Tx device -->
<path name="microphones">
<path name="builtin-mic-id-capture-list">
<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="1" value="1" />
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="2" value="2" />
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
</path>
<path name="microphones">
<path name="builtin-mic-id-capture-list" />
<ctl name="MIC DC Blocker" value="1" />
<ctl name="MIC Record Soft Gain (dB)" value="22" />
</path>
<path name="microphones (VOICE)">
<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" />
<path name="builtin-mic-id-capture-list" />
<ctl name="MIC DC Blocker" value="1" />
<ctl name="MIC HW Gain At High Power Mode (cB)" value="130" />
<ctl name="MIC Record Soft Gain (dB)" value="0" />
</path>
<path name="microphones (VOICE_COMMUNICATION,VOICE)">
<path name="microphones (VOICE)" />
</path>
<path name="microphones (VOICE_RECOGNITION)">
<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" />
<path name="builtin-mic-id-capture-list" />
<ctl name="MIC DC Blocker" value="1" />
<ctl name="MIC Record Soft Gain (dB)" value="22" />
</path>
@ -1316,91 +1312,47 @@
</path>
<path name="microphones (SOUND_TRIGGER_AEC)">
<ctl name="Audio Capture Eraser 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" />
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
<path name="builtin-mic-id-capture-list" />
<ctl name="MIC DC Blocker" value="1" />
<ctl name="Audio Capture Eraser Enable" value="1" />
<ctl name="Audio Capture Mic Source" value="ERASER" />
<ctl name="MIC Record Soft Gain (dB)" value="0" />
</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" />
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
<path name="microphones (CAMCORDER)">
<path name="builtin-mic-id-capture-list" />
<ctl name="MIC DC Blocker" value="1" />
<ctl name="MIC Record Soft Gain (dB)" value="22" />
<ctl name="MIC Record Soft Gain (dB)" value="0" />
</path>
<path name="microphones (UNPROCESSED)">
<path name="builtin-mic-id-capture-list" />
<ctl name="MIC DC Blocker" value="1" />
<ctl name="MIC Record Soft Gain (dB)" value="5" />
</path>
<path name="back-microphones">
<path name="microphones" />
</path>
<path name="back-microphones (VOICE)">
<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 HW Gain At High Power Mode (cB)" value="130" />
<ctl name="MIC Record Soft Gain (dB)" value="0" />
<path name="microphones (VOICE)" />
</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 name="back-microphones (VOICE_COMMUNICATION,VOICE)">
<path name="back-microphones (VOICE)" />
</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" />
<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="unprocessed-mic">
<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="5" />
</path>
<path name="unprocessed-dual-mic">
<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="5" />
</path>
<path name="unprocessed-triple-mic">
<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="5" />
<path name="back-microphones (UNPROCESSED)">
<path name="microphones (UNPROCESSED)" />
</path>
<path name="bluetooth-sco-headset-microphones">
<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" />
<path name="builtin-mic-id-capture-list" />
<ctl name="Audio Capture Mic Source" value="BT_MIC" />
<ctl name="Voice Call Mic Source" value="BT_MIC" />
<ctl name="MIC Record Soft Gain (dB)" value="0" />
@ -1411,9 +1363,7 @@
</path>
<path name="usb-microphones">
<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" />
<path name="builtin-mic-id-capture-list" />
<ctl name="BUILDIN MIC ID CAPTURE LIST" id="3" value="-1" />
<ctl name="Audio Capture Mic Source" value="USB_MIC" />
<ctl name="Voice Call Mic Source" value="USB_MIC" />
@ -1428,6 +1378,54 @@
<path name="usb-microphones" />
</path>
<path name="in-call-capture-source-0 (VOICE_DOWNLINK)">
<ctl name="Incall Capture Stream0" value="DL" />
</path>
<path name="in-call-capture-source-0 (VOICE_UPLINK)">
<ctl name="Incall Capture Stream0" value="UL" />
</path>
<path name="in-call-capture-source-0 (VOICE_CALL)">
<ctl name="Incall Capture Stream0" value="UL_DL" />
</path>
<path name="in-call-capture-source-0">
<path name="in-call-capture-source-0 (VOICE_DOWNLINK)" />
</path>
<path name="in-call-capture-source-1 (VOICE_DOWNLINK)">
<ctl name="Incall Capture Stream1" value="DL" />
</path>
<path name="in-call-capture-source-1 (VOICE_UPLINK)">
<ctl name="Incall Capture Stream1" value="UL" />
</path>
<path name="in-call-capture-source-1 (VOICE_CALL)">
<ctl name="Incall Capture Stream1" value="UL_DL" />
</path>
<path name="in-call-capture-source-1">
<path name="in-call-capture-source-1 (VOICE_DOWNLINK)" />
</path>
<path name="in-call-capture-source-2 (VOICE_DOWNLINK)">
<ctl name="Incall Capture Stream2" value="DL" />
</path>
<path name="in-call-capture-source-2 (VOICE_UPLINK)">
<ctl name="Incall Capture Stream2" value="UL" />
</path>
<path name="in-call-capture-source-2 (VOICE_CALL)">
<ctl name="Incall Capture Stream2" value="UL_DL" />
</path>
<path name="in-call-capture-source-2">
<path name="in-call-capture-source-2 (VOICE_DOWNLINK)" />
</path>
<!-- cs35l41 specific path to load firmware in cs35l41.c -->
<path name="cs35l41-load-protection-firmware-start">
<!-- Enable it after get the protection firmware -->

10
audio/shiba/audio-tables.mk
View file

@ -82,3 +82,13 @@ PRODUCT_COPY_FILES += \
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/waves/tests/test_preset.mps:$(TARGET_COPY_OUT_VENDOR)/etc/test_preset.mps
endif
ifeq ($(USE_AUDIO_HAL_AIDL),true)
# Offload spatializer config
PRODUCT_COPY_FILES += \
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/base:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/base \
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_2_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_2_ch \
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_6_ch:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_6_ch \
device/google/shusky/audio/$(AUDIO_TABLE_FOLDER)/tuning/spatializer/mode_xaural:$(TARGET_COPY_OUT_VENDOR)/etc/spatializer/mode_xaural \
endif

4
audio/shiba/config/audio_platform_configuration.xml
View file

@ -173,8 +173,8 @@
</input_backend_cfg_mic_mapping>
<usecase_attr>
<!-- for output with AUDIO_OUTPUT_FLAG_RAW, 32 periods * 64 frames(around 1.3ms) * 2ch * 4(s32) = 16384 bytes -->
<usecase id="UC_RAW_PLAYBACK" dev1="23" dyn_path="true" dsp_vol="false" mmap="true" period="64" period_num="32"/>
<!-- for output with AUDIO_OUTPUT_FLAG_RAW, 40 periods * 48 frames/period * 2ch * 4(s32) = 15360 bytes -->
<usecase id="UC_RAW_PLAYBACK" dev1="23" dyn_path="true" dsp_vol="false" mmap="false" period="48" period_num="40"/>
<!-- for output with AUDIO_OUTPUT_FLAG_PRIMARY|AUDIO_OUTPUT_FLAG_FAST, 4 * 10ms buffer -->
<usecase id="UC_LOW_LATENCY_PLAYBACK" dev1="1" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="4"/>
<!-- for output with AUDIO_OUTPUT_FLAG_MMAP_NOIRQ, 40 periods * 48 frames/period(=1ms w/ 48k sample rate) * 2ch *4(float) = 15360 bytes -->

BIN
audio/shiba/tuning/spatializer/base Normal file
View file

Binary file not shown.

BIN
audio/shiba/tuning/spatializer/mode_2_ch Normal file
View file

Binary file not shown.

BIN
audio/shiba/tuning/spatializer/mode_6_ch Normal file
View file

Binary file not shown.

BIN
audio/shiba/tuning/spatializer/mode_xaural Normal file
View file

Binary file not shown.

20
device-husky.mk
View file

@ -142,19 +142,31 @@ PRODUCT_COPY_FILES += \
PRODUCT_PRODUCT_PROPERTIES += \
ro.bluetooth.finder.supported=true
ifeq ($(USE_AUDIO_HAL_AIDL),true)
# AIDL
# declare use of stereo spatialization
PRODUCT_PROPERTY_OVERRIDES += \
ro.audio.stereo_spatialization_enabled=true
else
# HIDL
# Spatial Audio
PRODUCT_PACKAGES += \
libspatialaudio
# declare use of spatial audio
PRODUCT_PROPERTY_OVERRIDES += \
ro.audio.spatializer_enabled=true
# Sound Dose
PRODUCT_PACKAGES += \
android.hardware.audio.sounddose-vendor-impl \
audio_sounddose_aoc
endif
# declare use of spatial audio
PRODUCT_PROPERTY_OVERRIDES += \
ro.audio.spatializer_enabled=true
# Audio CCA property
PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.audio.cca.enabled=false

20
device-shiba.mk
View file

@ -130,19 +130,31 @@ PRODUCT_COPY_FILES += \
PRODUCT_PRODUCT_PROPERTIES += \
ro.bluetooth.finder.supported=true
ifeq ($(USE_AUDIO_HAL_AIDL),true)
# AIDL
# declare use of stereo spatialization
PRODUCT_PROPERTY_OVERRIDES += \
ro.audio.stereo_spatialization_enabled=true
else
# HIDL
# Spatial Audio
PRODUCT_PACKAGES += \
libspatialaudio
# declare use of spatial audio
PRODUCT_PROPERTY_OVERRIDES += \
ro.audio.spatializer_enabled=true
# Sound Dose
PRODUCT_PACKAGES += \
android.hardware.audio.sounddose-vendor-impl \
audio_sounddose_aoc
endif
# declare use of spatial audio
PRODUCT_PROPERTY_OVERRIDES += \
ro.audio.spatializer_enabled=true
# Audio CCA property
PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.audio.cca.enabled=false