Merge 24Q3 (ab/11976889) to aosp-main-future

Bug: 347831320
Merged-In: Id6ee1dee2b498f1ec718e85a79796ee7faefd4b3
Change-Id: Idb195cdd6d2fa43e3aebd7a510bbe7d2edced1c9
This commit is contained in:
Xin Li 2024-06-18 14:13:21 -07:00
commit 086d5c6b46
301 changed files with 28183 additions and 23705 deletions

2
OWNERS
View file

@ -1,4 +1,4 @@
per-file perf/*,thermal/*= jenhaochen@google.com,wvw@google.com,joaodias@google.com,rsubr@google.com,sayanna@google.com,liumartin@google.com,kamewang@google.com
# per-file for Pixel device makefiles, see go/pixel-device-mk-owner-checklist for details.
per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/OWNERS
per-file *.mk,*/BoardConfig.mk=file:device/google/gs-common:main:/MK_OWNERS

View file

@ -20,7 +20,7 @@ USE_SWIFTSHADER := false
BOARD_USES_SWIFTSHADER := false
$(call inherit-product, device/google/zumapro/aosp_common.mk)
$(call inherit-product, device/google/caimito/device-caiman.mk)
$(call inherit-product, device/google/caimito/caiman_generic.mk)
PRODUCT_NAME := aosp_caiman
PRODUCT_DEVICE := caiman

View file

@ -20,7 +20,7 @@ USE_SWIFTSHADER := false
BOARD_USES_SWIFTSHADER := false
$(call inherit-product, device/google/zumapro/aosp_common.mk)
$(call inherit-product, device/google/caimito/device-komodo.mk)
$(call inherit-product, device/google/caimito/komodo_generic.mk)
PRODUCT_NAME := aosp_komodo
PRODUCT_DEVICE := komodo

View file

@ -20,7 +20,7 @@ USE_SWIFTSHADER := false
BOARD_USES_SWIFTSHADER := false
$(call inherit-product, device/google/zumapro/aosp_common.mk)
$(call inherit-product, device/google/caimito/device-ripcurrentpro.mk)
$(call inherit-product, device/google/caimito/ripcurrentpro_generic.mk)
PRODUCT_NAME := aosp_ripcurrentpro
PRODUCT_DEVICE := ripcurrentpro

View file

@ -20,7 +20,7 @@ USE_SWIFTSHADER := false
BOARD_USES_SWIFTSHADER := false
$(call inherit-product, device/google/zumapro/aosp_common.mk)
$(call inherit-product, device/google/caimito/device-tokay.mk)
$(call inherit-product, device/google/caimito/tokay_generic.mk)
PRODUCT_NAME := aosp_tokay
PRODUCT_DEVICE := tokay

View file

@ -20,6 +20,12 @@
<argument name="Name" value="BCL_AUDIO_BAACL" />
<argument name="Strategy" value="MediaSpeakerAndScreenOn" />
</feature>
<feature name="BatteryMitigation">
<argument name="TargetDigitalVolume" value="809" />
<argument name="PcmRampMs" value="15ms" />
<argument name="ThrottleDurationMs" value="3000" />
<argument name="ThrottleMitigationLevel" value="LIGHT" />
</feature>
<feature name="PlaybackThermalThrottle">
<argument name="PollWaitMs" value="20000" />
<argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
@ -28,8 +34,11 @@
<argument name="SpeakerPowerPollWaitMs" value="5000" />
</feature>
<feature name="RuntimeTuningDump" />
<feature name="SoundDose" />
<!-- <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="MicrophoneCompensation" />
<feature name="spatializer-offload" />
</features>
<voipVolume>
@ -49,7 +58,6 @@
<device name="usb" />
<device name="speaker" codec="cs35l41">
<argument name="SpeakerNum" value="2" />
<argument name="Rotation" />
<argument name="AcousticShockProtection" />
</device>
</devices>
@ -80,8 +88,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" />
@ -95,19 +103,23 @@
<latency source="immersive-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
<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="microphones" sink="primary-capture" milliseconds="300" />
<latency source="back-microphones" sink="primary-capture" milliseconds="300" />
<latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="160" />
<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>

View file

@ -52,12 +52,14 @@ volume index from 0 to 100.
<point>100,-1800</point>
</volume>
<volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-4500</point>
<point>29,-3400</point>
<point>57,-2250</point>
<point>71,-1900</point>
<point>86,-1530</point>
<point>100,-1100</point>
<point>1,-5510</point>
<point>13,-4890</point>
<point>29,-4220</point>
<point>43,-3670</point>
<point>57,-3010</point>
<point>71,-2760</point>
<point>86,-2450</point>
<point>100,-2110</point>
</volume>
<volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@ -68,13 +70,13 @@ volume index from 0 to 100.
<volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-4000</point>
<point>29,-2950</point>
<point>43,-2350</point>
<point>57,-1850</point>
<point>71,-1400</point>
<point>86,-700</point>
<point>100,0</point>
<point>1,-4700</point>
<point>29,-3670</point>
<point>43,-3170</point>
<point>57,-2550</point>
<point>71,-1780</point>
<point>86,-480</point>
<point>100,-300</point>
</volume>
<volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
@ -85,31 +87,31 @@ volume index from 0 to 100.
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-9000</point>
<point>4,-6370</point>
<point>8,-6105</point>
<point>12,-5810</point>
<point>16,-5520</point>
<point>20,-5220</point>
<point>24,-4870</point>
<point>28,-4490</point>
<point>32,-4278</point>
<point>36,-4027</point>
<point>40,-3770</point>
<point>44,-3560</point>
<point>48,-3300</point>
<point>52,-3080</point>
<point>56,-2800</point>
<point>60,-2620</point>
<point>64,-2350</point>
<point>68,-2200</point>
<point>72,-2100</point>
<point>76,-1930</point>
<point>80,-1700</point>
<point>84,-1460</point>
<point>88,-1190</point>
<point>92,-850</point>
<point>96,-510</point>
<point>1,-9999</point>
<point>4,-5770</point>
<point>8,-5459</point>
<point>12,-5150</point>
<point>16,-5000</point>
<point>20,-4735</point>
<point>24,-4400</point>
<point>28,-4130</point>
<point>32,-3875</point>
<point>36,-3609</point>
<point>40,-3400</point>
<point>44,-3165</point>
<point>48,-2915</point>
<point>52,-2716</point>
<point>56,-2363</point>
<point>60,-2168</point>
<point>64,-1944</point>
<point>68,-1719</point>
<point>72,-1455</point>
<point>76,-1260</point>
<point>80,-1080</point>
<point>84,-900</point>
<point>88,-555</point>
<point>92,-392</point>
<point>96,-194</point>
<point>100,0</point>
</volume>
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@ -121,12 +123,13 @@ volume index from 0 to 100.
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>0,-5600</point>
<point>29,-3520</point>
<point>57,-1500</point>
<point>71,-1150</point>
<point>86,-500</point>
<point>100,0</point>
<point>0,-6660</point>
<point>17,-5250</point>
<point>33,-3500</point>
<point>50,-2480</point>
<point>67,-1280</point>
<point>83,-560</point>
<point>100,-220</point>
</volume>
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_NON_MUTABLE_EARPIECE_VOLUME_CURVE"/>
@ -137,11 +140,14 @@ volume index from 0 to 100.
<volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-4500</point>
<point>29,-3800</point>
<point>71,-1850</point>
<point>86,-1000</point>
<point>100,-500</point>
<point>1,-5700</point>
<point>14,-5020</point>
<point>29,-4280</point>
<point>43,-3750</point>
<point>57,-3150</point>
<point>71,-2550</point>
<point>86,-2050</point>
<point>100,-1200</point>
</volume>
<volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
@ -178,12 +184,14 @@ volume index from 0 to 100.
<point>100,-1800</point>
</volume>
<volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-4500</point>
<point>29,-3400</point>
<point>57,-2250</point>
<point>71,-1900</point>
<point>86,-1530</point>
<point>100,-1100</point>
<point>1,-5510</point>
<point>13,-4890</point>
<point>29,-4220</point>
<point>43,-3670</point>
<point>57,-3010</point>
<point>71,-2760</point>
<point>86,-2450</point>
<point>100,-2110</point>
</volume>
<volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@ -198,12 +206,14 @@ volume index from 0 to 100.
<point>100,-1800</point>
</volume>
<volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-5700</point>
<point>29,-4230</point>
<point>43,-3300</point>
<point>57,-3100</point>
<point>71,-2500</point>
<point>100,-1400</point>
<point>1,-6600</point>
<point>14,-5280</point>
<point>29,-4480</point>
<point>43,-3820</point>
<point>57,-3710</point>
<point>71,-3160</point>
<point>85,-2480</point>
<point>100,-2086</point>
</volume>
<volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>

View file

@ -71,8 +71,6 @@
<ctl name="R ASPTX4 Slot Position" value="7" />
<!-- Cirrus Booster Amp DRE and VBST config-->
<ctl name="VBSTMON Output Switch" value="1" />
<ctl name="R VBSTMON Output Switch" value="1" />
<ctl name="DRE DRE Switch" value="1" />
<ctl name="R DRE DRE Switch" value="1" />
@ -144,7 +142,6 @@
<ctl name="TDM_1_RX Mixer EP5" value="0" />
<ctl name="TDM_1_RX Mixer EP6" value="0" />
<ctl name="TDM_1_RX Mixer EP7" value="0" />
<ctl name="TDM_1_RX Mixer EP8" value="0" />
<ctl name="TDM_1_RX Mixer NoHost1" value="0" />
<ctl name="USB_RX Mixer EP1" value="0" />
@ -895,6 +892,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>
@ -1087,11 +1096,15 @@
<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" />
@ -1210,53 +1223,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 -> 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 -> 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 -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="DL" />
</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 -->
@ -1282,10 +1251,10 @@
<path name="speaker">
<ctl name="Main AMP Enable Switch" value="1" />
<ctl name="R Main AMP Enable Switch" value="1" />
<ctl name="Fast Use Case Delta File" value="fast_switch3.txt" />
<!--ctl name="Fast Use Case Delta File" value="fast_switch3.txt" />
<ctl name="Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Switch Enable" value="1" /-->
</path>
<path name="speaker (VOICE)">
@ -1294,17 +1263,17 @@
<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 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" />
<ctl name="R Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Switch Enable" value="1" /-->
</path>
<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" />
<!--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 -->
@ -1328,18 +1297,16 @@
<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)">
<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_RECOGNITION,SOUND_TRIGGER_TAP)">
<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 (SOUND_TRIGGER_AEC)">
<path name="builtin-mic-id-capture-list" />
<ctl name="MIC DC Blocker" value="1" />
@ -1368,6 +1335,10 @@
<path name="microphones (VOICE)" />
</path>
<path name="back-microphones (VOICE_COMMUNICATION,VOICE)">
<path name="back-microphones (VOICE)" />
</path>
<path name="back-microphones (CAMCORDER)">
<path name="microphones (CAMCORDER)" />
</path>
@ -1394,13 +1365,69 @@
<path name="bluetooth-sco-headset-microphones" />
</path>
<path name="usb-headset-microphones">
<path name="usb-microphones">
<path name="builtin-mic-id-capture-list" />
<ctl name="Audio Capture Mic Source" value="USB_MIC" />
<ctl name="Voice Call Mic Source" value="USB_MIC" />
<ctl name="MIC Record Soft Gain (dB)" value="0" />
</path>
<path name="usb-headset-microphones">
<path name="usb-microphones" />
</path>
<path name="usb-device-microphones">
<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 -->

View file

@ -80,3 +80,10 @@ PRODUCT_COPY_FILES += \
device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml
endif
# Offload spatializer config
PRODUCT_PACKAGES += \
vendor.google.whitechapel.audio.hal.effect.spatializer.base \
vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch \
vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch \
vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural

View file

@ -134,10 +134,6 @@
</devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -157,8 +153,6 @@
</devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"

View file

@ -134,10 +134,6 @@
</devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -157,8 +153,6 @@
</devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort>
<devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">

View file

@ -130,10 +130,6 @@
</devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -153,8 +149,6 @@
</devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort>
<devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">

View file

@ -134,10 +134,6 @@
</devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -157,8 +153,6 @@
</devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"

View file

@ -0,0 +1,41 @@
// Copyright (C) 2024 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
soong_namespace {
}
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
cc_prebuilt_library_shared {
name: "libspeechenhancer",
vendor: true,
owner: "google",
proprietary: true,
allow_undefined_symbols: true,
arch: {
arm64: {
srcs: ["arm64/libspeechenhancer.so"],
},
},
shared_libs: [
"libcutils",
"libEGL",
"libGLESv2",
"liblog",
"libz",
"libnativewindow",
],
}

View file

@ -128,3 +128,35 @@ prebuilt_etc {
src: "waves/tests/test_preset.mps",
soc_specific: true,
}
prebuilt_etc {
name: "vendor.google.whitechapel.audio.hal.effect.spatializer.base",
src: "spatializer/base",
soc_specific: true,
filename_from_src: true,
relative_install_path: "spatializer",
}
prebuilt_etc {
name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch",
src: "spatializer/mode_2_ch",
soc_specific: true,
filename_from_src: true,
relative_install_path: "spatializer",
}
prebuilt_etc {
name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch",
src: "spatializer/mode_6_ch",
soc_specific: true,
filename_from_src: true,
relative_install_path: "spatializer",
}
prebuilt_etc {
name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural",
src: "spatializer/mode_xaural",
soc_specific: true,
filename_from_src: true,
relative_install_path: "spatializer",
}

View file

@ -17,8 +17,8 @@
<param id="18" name="noiseGate" type="float"/>
<param id="19" name="minGain" type="float"/>
<param id="20" name="maxGain" type="float"/>
<param id="21" name="longGainAtRt" type="uint32"/>
<param id="22" name="GainAtRt" type="uint32"/>
<param id="21" name="releaseTime" type="uint32"/>
<param id="22" name="attackTime" type="uint32"/>
<param id="23" name="rmsTav" type="uint32"/>
</module>
<module id="6" name="Surround Record">
@ -60,6 +60,10 @@
<param default="5" name="CB_smooth_span" type="int32"/>
<param default="1.0" name="CB_forget_factor" type="float"/>
</struct>
<struct id="35">
<param name="IIR_lowpass" size="5" type="float"/>
<param name="IIR_highpass" size="5" type="float"/>
</struct>
</module>
<module id="7" name="Multi Channel IIR 2">
<param default="0" id="0" max="3" name="opMode_" type="uint32"/>
@ -281,7 +285,7 @@
<param name="crossover_iir_hp2" size="5" type="float"/>
<param default="250" max="1000" min="5" name="environment_rms_window_ms" type="int32"/>
<param default="-40" max="0" name="environment_rms_threshold_db" type="float"/>
<param default="10000" min="0" name="environment_rms_attack_release_ms" type="int32"/>
<param default="50" min="0" name="environment_low_to_high_ms" type="int32"/>
<param default="1" min="0" name="environment_loudness_ratio_band0" type="float"/>
<param default="1" min="0" name="environment_loudness_ratio_band1" type="float"/>
<param default="1" min="0" name="environment_loudness_ratio_band2" type="float"/>
@ -432,6 +436,7 @@
<param default="-30" name="drc_long_term_window_upper_db_band0" type="float"/>
<param default="-30" name="drc_long_term_window_upper_db_band1" type="float"/>
<param default="-30" name="drc_long_term_window_upper_db_band2" type="float"/>
<param default="10000" min="0" name="environment_high_to_low_ms" type="int32"/>
</struct>
</module>
<module id="10000" name="Eraser">

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -56,16 +56,16 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
#AudioFormatIncrement=8
[CUSTOM_ACTION_260]
CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0,PRESET:SPEAKER_MUSIC
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
CASE_4=PRIORITY:3,NUMBERS:2:0|1:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
CASE_7=PRIORITY:6,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
CASE_1=PRIORITY:0,NUMBERS:2:0|1|4:1|2:0,PRESET:SPEAKER_MUSIC
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
CASE_4=PRIORITY:3,NUMBERS:2:0|1|4:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
CASE_7=PRIORITY:6,NUMBERS:2:0|1|4:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
CASE_8=PRIORITY:7,NUMBERS:2:0|1|4:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
# Action 260 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t, sound_usage_t
# - audio_devices_t : current active device
# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip
# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip, 4 - call screen
# - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
# - sound_usage_t: 0 - Music, 1 - Movie

View file

@ -20,6 +20,12 @@
<argument name="Name" value="BCL_AUDIO_BAACL" />
<argument name="Strategy" value="MediaSpeakerAndScreenOn" />
</feature>
<feature name="BatteryMitigation">
<argument name="TargetDigitalVolume" value="809" />
<argument name="PcmRampMs" value="15ms" />
<argument name="ThrottleDurationMs" value="3000" />
<argument name="ThrottleMitigationLevel" value="LIGHT" />
</feature>
<feature name="PlaybackThermalThrottle">
<argument name="PollWaitMs" value="20000" />
<argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
@ -28,8 +34,11 @@
<argument name="SpeakerPowerPollWaitMs" value="5000" />
</feature>
<feature name="RuntimeTuningDump" />
<feature name="SoundDose" />
<!-- <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="MicrophoneCompensation" />
<feature name="spatializer-offload" />
</features>
<voipVolume>
@ -49,7 +58,6 @@
<device name="usb" />
<device name="speaker" codec="cs35l41">
<argument name="SpeakerNum" value="2" />
<argument name="Rotation" />
<argument name="AcousticShockProtection" />
</device>
</devices>
@ -80,8 +88,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" />
@ -95,19 +103,23 @@
<latency source="immersive-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
<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="microphones" sink="primary-capture" milliseconds="300" />
<latency source="back-microphones" sink="primary-capture" milliseconds="300" />
<latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="160" />
<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>

View file

@ -53,12 +53,13 @@ volume index from 0 to 100.
</volume>
<volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-5200</point>
<point>13,-5000</point>
<point>28,-4400</point>
<point>56,-3380</point>
<point>71,-3120</point>
<point>85,-2750</point>
<point>100,-2150</point>
<point>13,-4455</point>
<point>29,-3660</point>
<point>43,-3165</point>
<point>57,-2630</point>
<point>71,-2400</point>
<point>86,-2100</point>
<point>100,-1720</point>
</volume>
<volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@ -69,10 +70,13 @@ volume index from 0 to 100.
<volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-4935</point>
<point>14,-3320</point>
<point>28,-2960</point>
<point>71,-1400</point>
<point>1,-4250</point>
<point>14,-3450</point>
<point>29,-3000</point>
<point>43,-2500</point>
<point>57,-1840</point>
<point>71,-1090</point>
<point>86,-400</point>
<point>100,0</point>
</volume>
<volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@ -84,31 +88,31 @@ volume index from 0 to 100.
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-6100</point>
<point>4,-5910</point>
<point>8,-5634</point>
<point>12,-5300</point>
<point>16,-4995</point>
<point>20,-4670</point>
<point>24,-4300</point>
<point>28,-3944</point>
<point>32,-3705</point>
<point>36,-3472</point>
<point>40,-3200</point>
<point>44,-3020</point>
<point>48,-2800</point>
<point>52,-2575</point>
<point>56,-2300</point>
<point>60,-2130</point>
<point>64,-1925</point>
<point>68,-1710</point>
<point>72,-1600</point>
<point>76,-1500</point>
<point>80,-1375</point>
<point>84,-1277</point>
<point>88,-991</point>
<point>92,-741</point>
<point>96,-475</point>
<point>1,-6500</point>
<point>4,-6140</point>
<point>8,-5854</point>
<point>12,-5568</point>
<point>16,-5255</point>
<point>20,-4923</point>
<point>24,-4543</point>
<point>28,-4142</point>
<point>32,-3895</point>
<point>36,-3634</point>
<point>40,-3364</point>
<point>44,-3195</point>
<point>48,-2996</point>
<point>52,-2773</point>
<point>56,-2584</point>
<point>60,-2407</point>
<point>64,-2234</point>
<point>68,-2039</point>
<point>72,-1914</point>
<point>76,-1787</point>
<point>80,-1612</point>
<point>84,-1333</point>
<point>88,-1030</point>
<point>92,-698</point>
<point>96,-312</point>
<point>100,0</point>
</volume>
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@ -120,11 +124,13 @@ volume index from 0 to 100.
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>0,-5600</point>
<point>14,-4670</point>
<point>28,-3060</point>
<point>71,-1050</point>
<point>100,-100</point>
<point>0,-5510</point>
<point>17,-4660</point>
<point>33,-3000</point>
<point>50,-2000</point>
<point>67,-890</point>
<point>83,-270</point>
<point>100,0</point>
</volume>
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_NON_MUTABLE_EARPIECE_VOLUME_CURVE"/>
@ -135,12 +141,14 @@ volume index from 0 to 100.
<volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-6350</point>
<point>14,-4300</point>
<point>28,-3710</point>
<point>66,-2100</point>
<point>85,-1550</point>
<point>100,-780</point>
<point>1,-4700</point>
<point>13,-4380</point>
<point>29,-3680</point>
<point>43,-3130</point>
<point>57,-2490</point>
<point>71,-1900</point>
<point>86,-1340</point>
<point>100,-680</point>
</volume>
<volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
@ -178,12 +186,13 @@ volume index from 0 to 100.
</volume>
<volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-5200</point>
<point>13,-5000</point>
<point>28,-4400</point>
<point>56,-3380</point>
<point>71,-3120</point>
<point>85,-2750</point>
<point>100,-2150</point>
<point>13,-4455</point>
<point>29,-3660</point>
<point>43,-3165</point>
<point>57,-2630</point>
<point>71,-2400</point>
<point>86,-2100</point>
<point>100,-1720</point>
</volume>
<volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@ -199,11 +208,13 @@ volume index from 0 to 100.
</volume>
<volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-6600</point>
<point>13,-6220</point>
<point>28,-5500</point>
<point>42,-4600</point>
<point>57,-4250</point>
<point>100,-2780</point>
<point>14,-5440</point>
<point>29,-4740</point>
<point>43,-3850</point>
<point>57,-3520</point>
<point>71,-2900</point>
<point>85,-2470</point>
<point>100,-2038</point>
</volume>
<volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>

View file

@ -71,8 +71,6 @@
<ctl name="R ASPTX4 Slot Position" value="7" />
<!-- Cirrus Booster Amp DRE and VBST config-->
<ctl name="VBSTMON Output Switch" value="1" />
<ctl name="R VBSTMON Output Switch" value="1" />
<ctl name="DRE DRE Switch" value="1" />
<ctl name="R DRE DRE Switch" value="1" />
@ -144,7 +142,6 @@
<ctl name="TDM_1_RX Mixer EP5" value="0" />
<ctl name="TDM_1_RX Mixer EP6" value="0" />
<ctl name="TDM_1_RX Mixer EP7" value="0" />
<ctl name="TDM_1_RX Mixer EP8" value="0" />
<ctl name="TDM_1_RX Mixer NoHost1" value="0" />
<ctl name="USB_RX Mixer EP1" value="0" />
@ -895,6 +892,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>
@ -1087,11 +1096,15 @@
<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" />
@ -1210,53 +1223,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 -> 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 -> 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 -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="DL" />
</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 -->
@ -1282,10 +1251,10 @@
<path name="speaker">
<ctl name="Main AMP Enable Switch" value="1" />
<ctl name="R Main AMP Enable Switch" value="1" />
<ctl name="Fast Use Case Delta File" value="fast_switch3.txt" />
<!--ctl name="Fast Use Case Delta File" value="fast_switch3.txt" />
<ctl name="Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Switch Enable" value="1" /-->
</path>
<path name="speaker (VOICE)">
@ -1294,17 +1263,17 @@
<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 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" />
<ctl name="R Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Switch Enable" value="1" /-->
</path>
<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" />
<!--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 -->
@ -1328,18 +1297,16 @@
<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)">
<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_RECOGNITION,SOUND_TRIGGER_TAP)">
<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 (SOUND_TRIGGER_AEC)">
<path name="builtin-mic-id-capture-list" />
<ctl name="MIC DC Blocker" value="1" />
@ -1368,6 +1335,10 @@
<path name="microphones (VOICE)" />
</path>
<path name="back-microphones (VOICE_COMMUNICATION,VOICE)">
<path name="back-microphones (VOICE)" />
</path>
<path name="back-microphones (CAMCORDER)">
<path name="microphones (CAMCORDER)" />
</path>
@ -1394,13 +1365,69 @@
<path name="bluetooth-sco-headset-microphones" />
</path>
<path name="usb-headset-microphones">
<path name="usb-microphones">
<path name="builtin-mic-id-capture-list" />
<ctl name="Audio Capture Mic Source" value="USB_MIC" />
<ctl name="Voice Call Mic Source" value="USB_MIC" />
<ctl name="MIC Record Soft Gain (dB)" value="0" />
</path>
<path name="usb-headset-microphones">
<path name="usb-microphones" />
</path>
<path name="usb-device-microphones">
<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 -->

View file

@ -80,3 +80,10 @@ PRODUCT_COPY_FILES += \
device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml
endif
# Offload spatializer config
PRODUCT_PACKAGES += \
vendor.google.whitechapel.audio.hal.effect.spatializer.base \
vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch \
vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch \
vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural

View file

@ -134,10 +134,6 @@
</devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -157,8 +153,6 @@
</devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"

View file

@ -134,10 +134,6 @@
</devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -157,8 +153,6 @@
</devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort>
<devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">

View file

@ -130,10 +130,6 @@
</devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -153,8 +149,6 @@
</devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort>
<devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">

View file

@ -134,10 +134,6 @@
</devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -157,8 +153,6 @@
</devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"

View file

@ -0,0 +1,41 @@
// Copyright (C) 2024 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
soong_namespace {
}
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
cc_prebuilt_library_shared {
name: "libspeechenhancer",
vendor: true,
owner: "google",
proprietary: true,
allow_undefined_symbols: true,
arch: {
arm64: {
srcs: ["arm64/libspeechenhancer.so"],
},
},
shared_libs: [
"libcutils",
"libEGL",
"libGLESv2",
"liblog",
"libz",
"libnativewindow",
],
}

View file

@ -128,3 +128,35 @@ prebuilt_etc {
src: "waves/tests/test_preset.mps",
soc_specific: true,
}
prebuilt_etc {
name: "vendor.google.whitechapel.audio.hal.effect.spatializer.base",
src: "spatializer/base",
soc_specific: true,
filename_from_src: true,
relative_install_path: "spatializer",
}
prebuilt_etc {
name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch",
src: "spatializer/mode_2_ch",
soc_specific: true,
filename_from_src: true,
relative_install_path: "spatializer",
}
prebuilt_etc {
name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch",
src: "spatializer/mode_6_ch",
soc_specific: true,
filename_from_src: true,
relative_install_path: "spatializer",
}
prebuilt_etc {
name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural",
src: "spatializer/mode_xaural",
soc_specific: true,
filename_from_src: true,
relative_install_path: "spatializer",
}

View file

@ -17,8 +17,8 @@
<param id="18" name="noiseGate" type="float"/>
<param id="19" name="minGain" type="float"/>
<param id="20" name="maxGain" type="float"/>
<param id="21" name="longGainAtRt" type="uint32"/>
<param id="22" name="GainAtRt" type="uint32"/>
<param id="21" name="releaseTime" type="uint32"/>
<param id="22" name="attackTime" type="uint32"/>
<param id="23" name="rmsTav" type="uint32"/>
</module>
<module id="6" name="Surround Record">
@ -60,6 +60,10 @@
<param default="5" name="CB_smooth_span" type="int32"/>
<param default="1.0" name="CB_forget_factor" type="float"/>
</struct>
<struct id="35">
<param name="IIR_lowpass" size="5" type="float"/>
<param name="IIR_highpass" size="5" type="float"/>
</struct>
</module>
<module id="7" name="Multi Channel IIR 2">
<param default="0" id="0" max="3" name="opMode_" type="uint32"/>
@ -281,7 +285,7 @@
<param name="crossover_iir_hp2" size="5" type="float"/>
<param default="250" max="1000" min="5" name="environment_rms_window_ms" type="int32"/>
<param default="-40" max="0" name="environment_rms_threshold_db" type="float"/>
<param default="10000" min="0" name="environment_rms_attack_release_ms" type="int32"/>
<param default="50" min="0" name="environment_low_to_high_ms" type="int32"/>
<param default="1" min="0" name="environment_loudness_ratio_band0" type="float"/>
<param default="1" min="0" name="environment_loudness_ratio_band1" type="float"/>
<param default="1" min="0" name="environment_loudness_ratio_band2" type="float"/>
@ -432,6 +436,7 @@
<param default="-30" name="drc_long_term_window_upper_db_band0" type="float"/>
<param default="-30" name="drc_long_term_window_upper_db_band1" type="float"/>
<param default="-30" name="drc_long_term_window_upper_db_band2" type="float"/>
<param default="10000" min="0" name="environment_high_to_low_ms" type="int32"/>
</struct>
</module>
<module id="10000" name="Eraser">

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -56,16 +56,16 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
#AudioFormatIncrement=8
[CUSTOM_ACTION_260]
CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0,PRESET:SPEAKER_MUSIC
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
CASE_4=PRIORITY:3,NUMBERS:2:0|1:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
CASE_7=PRIORITY:6,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
CASE_1=PRIORITY:0,NUMBERS:2:0|1|4:1|2:0,PRESET:SPEAKER_MUSIC
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
CASE_4=PRIORITY:3,NUMBERS:2:0|1|4:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
CASE_7=PRIORITY:6,NUMBERS:2:0|1|4:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
CASE_8=PRIORITY:7,NUMBERS:2:0|1|4:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
# Action 260 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t, sound_usage_t
# - audio_devices_t : current active device
# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip
# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip, 4 - call screen
# - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
# - sound_usage_t: 0 - Music, 1 - Movie

View file

@ -20,6 +20,12 @@
<argument name="Name" value="BCL_AUDIO_BAACL" />
<argument name="Strategy" value="MediaSpeakerAndScreenOn" />
</feature>
<feature name="BatteryMitigation">
<argument name="TargetDigitalVolume" value="809" />
<argument name="PcmRampMs" value="15ms" />
<argument name="ThrottleDurationMs" value="3000" />
<argument name="ThrottleMitigationLevel" value="LIGHT" />
</feature>
<feature name="PlaybackThermalThrottle">
<argument name="PollWaitMs" value="20000" />
<argument name="ThermistorName" value="VIRTUAL-SKIN-SPEAKER" />
@ -28,8 +34,11 @@
<argument name="SpeakerPowerPollWaitMs" value="5000" />
</feature>
<feature name="RuntimeTuningDump" />
<feature name="SoundDose" />
<!-- <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="MicrophoneCompensation" />
<feature name="spatializer-offload" />
</features>
<voipVolume>
@ -49,7 +58,6 @@
<device name="usb" />
<device name="speaker" codec="cs35l41">
<argument name="SpeakerNum" value="2" />
<argument name="Rotation" />
<argument name="AcousticShockProtection" />
</device>
</devices>
@ -80,8 +88,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" />
@ -95,19 +103,23 @@
<latency source="immersive-playback" sink="bluetooth-a2dp-device" milliseconds="100" />
<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="microphones" sink="primary-capture" milliseconds="300" />
<latency source="back-microphones" sink="primary-capture" milliseconds="300" />
<latency source="bluetooth-sco-headset" sink="primary-capture" milliseconds="160" />
<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>

View file

@ -52,12 +52,14 @@ volume index from 0 to 100.
<point>100,-1800</point>
</volume>
<volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-4500</point>
<point>29,-3400</point>
<point>57,-2250</point>
<point>71,-1900</point>
<point>86,-1530</point>
<point>100,-1100</point>
<point>1,-5510</point>
<point>13,-4890</point>
<point>29,-4220</point>
<point>43,-3670</point>
<point>57,-3010</point>
<point>71,-2760</point>
<point>86,-2450</point>
<point>100,-2110</point>
</volume>
<volume stream="AUDIO_STREAM_SYSTEM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@ -68,13 +70,13 @@ volume index from 0 to 100.
<volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-4000</point>
<point>29,-2950</point>
<point>43,-2350</point>
<point>57,-1850</point>
<point>71,-1400</point>
<point>86,-700</point>
<point>100,0</point>
<point>1,-4700</point>
<point>29,-3670</point>
<point>43,-3170</point>
<point>57,-2550</point>
<point>71,-1780</point>
<point>86,-480</point>
<point>100,-300</point>
</volume>
<volume stream="AUDIO_STREAM_RING" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
@ -85,31 +87,31 @@ volume index from 0 to 100.
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_MEDIA_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-9000</point>
<point>4,-6370</point>
<point>8,-6105</point>
<point>12,-5810</point>
<point>16,-5520</point>
<point>20,-5220</point>
<point>24,-4870</point>
<point>28,-4490</point>
<point>32,-4278</point>
<point>36,-4027</point>
<point>40,-3770</point>
<point>44,-3560</point>
<point>48,-3300</point>
<point>52,-3080</point>
<point>56,-2800</point>
<point>60,-2620</point>
<point>64,-2350</point>
<point>68,-2200</point>
<point>72,-2100</point>
<point>76,-1930</point>
<point>80,-1700</point>
<point>84,-1460</point>
<point>88,-1190</point>
<point>92,-850</point>
<point>96,-510</point>
<point>1,-9999</point>
<point>4,-5770</point>
<point>8,-5459</point>
<point>12,-5150</point>
<point>16,-5000</point>
<point>20,-4735</point>
<point>24,-4400</point>
<point>28,-4130</point>
<point>32,-3875</point>
<point>36,-3609</point>
<point>40,-3400</point>
<point>44,-3165</point>
<point>48,-2915</point>
<point>52,-2716</point>
<point>56,-2363</point>
<point>60,-2168</point>
<point>64,-1944</point>
<point>68,-1719</point>
<point>72,-1455</point>
<point>76,-1260</point>
<point>80,-1080</point>
<point>84,-900</point>
<point>88,-555</point>
<point>92,-392</point>
<point>96,-194</point>
<point>100,0</point>
</volume>
<volume stream="AUDIO_STREAM_MUSIC" deviceCategory="DEVICE_CATEGORY_EARPIECE"
@ -121,12 +123,13 @@ volume index from 0 to 100.
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_NON_MUTABLE_HEADSET_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>0,-5600</point>
<point>29,-3520</point>
<point>57,-1500</point>
<point>71,-1150</point>
<point>86,-500</point>
<point>100,0</point>
<point>0,-6660</point>
<point>17,-5250</point>
<point>33,-3500</point>
<point>50,-2480</point>
<point>67,-1280</point>
<point>83,-560</point>
<point>100,-220</point>
</volume>
<volume stream="AUDIO_STREAM_ALARM" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_NON_MUTABLE_EARPIECE_VOLUME_CURVE"/>
@ -137,11 +140,14 @@ volume index from 0 to 100.
<volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_HEADSET"
ref="DEFAULT_DEVICE_CATEGORY_HEADSET_VOLUME_CURVE"/>
<volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-4500</point>
<point>29,-3800</point>
<point>71,-1850</point>
<point>86,-1000</point>
<point>100,-500</point>
<point>1,-5700</point>
<point>14,-5020</point>
<point>29,-4280</point>
<point>43,-3750</point>
<point>57,-3150</point>
<point>71,-2550</point>
<point>86,-2050</point>
<point>100,-1200</point>
</volume>
<volume stream="AUDIO_STREAM_NOTIFICATION" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_DEVICE_CATEGORY_EARPIECE_VOLUME_CURVE"/>
@ -178,12 +184,14 @@ volume index from 0 to 100.
<point>100,-1800</point>
</volume>
<volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-4500</point>
<point>29,-3400</point>
<point>57,-2250</point>
<point>71,-1900</point>
<point>86,-1530</point>
<point>100,-1100</point>
<point>1,-5510</point>
<point>13,-4890</point>
<point>29,-4220</point>
<point>43,-3670</point>
<point>57,-3010</point>
<point>71,-2760</point>
<point>86,-2450</point>
<point>100,-2110</point>
</volume>
<volume stream="AUDIO_STREAM_ENFORCED_AUDIBLE" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>
@ -198,12 +206,14 @@ volume index from 0 to 100.
<point>100,-1800</point>
</volume>
<volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_SPEAKER">
<point>1,-5700</point>
<point>29,-4230</point>
<point>43,-3300</point>
<point>57,-3100</point>
<point>71,-2500</point>
<point>100,-1400</point>
<point>1,-6600</point>
<point>14,-5280</point>
<point>29,-4480</point>
<point>43,-3820</point>
<point>57,-3710</point>
<point>71,-3160</point>
<point>85,-2480</point>
<point>100,-2086</point>
</volume>
<volume stream="AUDIO_STREAM_DTMF" deviceCategory="DEVICE_CATEGORY_EARPIECE"
ref="DEFAULT_SYSTEM_VOLUME_CURVE"/>

View file

@ -71,8 +71,6 @@
<ctl name="R ASPTX4 Slot Position" value="7" />
<!-- Cirrus Booster Amp DRE and VBST config-->
<ctl name="VBSTMON Output Switch" value="1" />
<ctl name="R VBSTMON Output Switch" value="1" />
<ctl name="DRE DRE Switch" value="1" />
<ctl name="R DRE DRE Switch" value="1" />
@ -144,7 +142,6 @@
<ctl name="TDM_1_RX Mixer EP5" value="0" />
<ctl name="TDM_1_RX Mixer EP6" value="0" />
<ctl name="TDM_1_RX Mixer EP7" value="0" />
<ctl name="TDM_1_RX Mixer EP8" value="0" />
<ctl name="TDM_1_RX Mixer NoHost1" value="0" />
<ctl name="USB_RX Mixer EP1" value="0" />
@ -895,6 +892,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>
@ -1087,11 +1096,15 @@
<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" />
@ -1210,53 +1223,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 -> 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 -> 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 -> in-call-capture-2">
<ctl name="Incall Capture Stream2" value="DL" />
</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 -->
@ -1282,10 +1251,10 @@
<path name="speaker">
<ctl name="Main AMP Enable Switch" value="1" />
<ctl name="R Main AMP Enable Switch" value="1" />
<ctl name="Fast Use Case Delta File" value="fast_switch3.txt" />
<!--ctl name="Fast Use Case Delta File" value="fast_switch3.txt" />
<ctl name="Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Delta File" value="fast_switch4.txt" />
<ctl name="R Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Switch Enable" value="1" /-->
</path>
<path name="speaker (VOICE)">
@ -1294,17 +1263,17 @@
<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 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" />
<ctl name="R Fast Use Case Switch Enable" value="1" />
<ctl name="R Fast Use Case Switch Enable" value="1" /-->
</path>
<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" />
<!--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 -->
@ -1328,18 +1297,16 @@
<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)">
<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_RECOGNITION,SOUND_TRIGGER_TAP)">
<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 (SOUND_TRIGGER_AEC)">
<path name="builtin-mic-id-capture-list" />
<ctl name="MIC DC Blocker" value="1" />
@ -1368,6 +1335,10 @@
<path name="microphones (VOICE)" />
</path>
<path name="back-microphones (VOICE_COMMUNICATION,VOICE)">
<path name="back-microphones (VOICE)" />
</path>
<path name="back-microphones (CAMCORDER)">
<path name="microphones (CAMCORDER)" />
</path>
@ -1394,13 +1365,69 @@
<path name="bluetooth-sco-headset-microphones" />
</path>
<path name="usb-headset-microphones">
<path name="usb-microphones">
<path name="builtin-mic-id-capture-list" />
<ctl name="Audio Capture Mic Source" value="USB_MIC" />
<ctl name="Voice Call Mic Source" value="USB_MIC" />
<ctl name="MIC Record Soft Gain (dB)" value="0" />
</path>
<path name="usb-headset-microphones">
<path name="usb-microphones" />
</path>
<path name="usb-device-microphones">
<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 -->

View file

@ -80,3 +80,10 @@ PRODUCT_COPY_FILES += \
device/google/caimito/audio/$(AUDIO_TABLE_FOLDER)/cs35l41/crus_sp_cal_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/crus_sp_cal_mixer_paths.xml
endif
# Offload spatializer config
PRODUCT_PACKAGES += \
vendor.google.whitechapel.audio.hal.effect.spatializer.base \
vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch \
vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch \
vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural

View file

@ -134,10 +134,6 @@
</devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -157,8 +153,6 @@
</devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"

View file

@ -134,10 +134,6 @@
</devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -157,8 +153,6 @@
</devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort>
<devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">

View file

@ -130,10 +130,6 @@
</devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -153,8 +149,6 @@
</devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort>
<devicePort tagName="USB Device In" type="AUDIO_DEVICE_IN_USB_DEVICE" role="source">

View file

@ -134,10 +134,6 @@
</devicePort>
<devicePort tagName="Speaker Safe" type="AUDIO_DEVICE_OUT_SPEAKER_SAFE" role="sink">
</devicePort>
<devicePort tagName="Wired Headset" type="AUDIO_DEVICE_OUT_WIRED_HEADSET" role="sink">
</devicePort>
<devicePort tagName="Wired Headphones" type="AUDIO_DEVICE_OUT_WIRED_HEADPHONE" role="sink">
</devicePort>
<devicePort tagName="BT SCO" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO" role="sink">
</devicePort>
<devicePort tagName="BT SCO Headset" type="AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET" role="sink">
@ -157,8 +153,6 @@
</devicePort>
<devicePort tagName="Built-In Back Mic" type="AUDIO_DEVICE_IN_BACK_MIC" role="source">
</devicePort>
<devicePort tagName="Wired Headset Mic" type="AUDIO_DEVICE_IN_WIRED_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort>
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"

View file

@ -0,0 +1,41 @@
// Copyright (C) 2024 The Android Open Source Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
soong_namespace {
}
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
cc_prebuilt_library_shared {
name: "libspeechenhancer",
vendor: true,
owner: "google",
proprietary: true,
allow_undefined_symbols: true,
arch: {
arm64: {
srcs: ["arm64/libspeechenhancer.so"],
},
},
shared_libs: [
"libcutils",
"libEGL",
"libGLESv2",
"liblog",
"libz",
"libnativewindow",
],
}

View file

@ -128,3 +128,35 @@ prebuilt_etc {
src: "waves/tests/test_preset.mps",
soc_specific: true,
}
prebuilt_etc {
name: "vendor.google.whitechapel.audio.hal.effect.spatializer.base",
src: "spatializer/base",
soc_specific: true,
filename_from_src: true,
relative_install_path: "spatializer",
}
prebuilt_etc {
name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_2_ch",
src: "spatializer/mode_2_ch",
soc_specific: true,
filename_from_src: true,
relative_install_path: "spatializer",
}
prebuilt_etc {
name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_6_ch",
src: "spatializer/mode_6_ch",
soc_specific: true,
filename_from_src: true,
relative_install_path: "spatializer",
}
prebuilt_etc {
name: "vendor.google.whitechapel.audio.hal.effect.spatializer.mode_xaural",
src: "spatializer/mode_xaural",
soc_specific: true,
filename_from_src: true,
relative_install_path: "spatializer",
}

View file

@ -17,8 +17,8 @@
<param id="18" name="noiseGate" type="float"/>
<param id="19" name="minGain" type="float"/>
<param id="20" name="maxGain" type="float"/>
<param id="21" name="longGainAtRt" type="uint32"/>
<param id="22" name="GainAtRt" type="uint32"/>
<param id="21" name="releaseTime" type="uint32"/>
<param id="22" name="attackTime" type="uint32"/>
<param id="23" name="rmsTav" type="uint32"/>
</module>
<module id="6" name="Surround Record">
@ -60,6 +60,10 @@
<param default="5" name="CB_smooth_span" type="int32"/>
<param default="1.0" name="CB_forget_factor" type="float"/>
</struct>
<struct id="35">
<param name="IIR_lowpass" size="5" type="float"/>
<param name="IIR_highpass" size="5" type="float"/>
</struct>
</module>
<module id="7" name="Multi Channel IIR 2">
<param default="0" id="0" max="3" name="opMode_" type="uint32"/>
@ -281,7 +285,7 @@
<param name="crossover_iir_hp2" size="5" type="float"/>
<param default="250" max="1000" min="5" name="environment_rms_window_ms" type="int32"/>
<param default="-40" max="0" name="environment_rms_threshold_db" type="float"/>
<param default="10000" min="0" name="environment_rms_attack_release_ms" type="int32"/>
<param default="50" min="0" name="environment_low_to_high_ms" type="int32"/>
<param default="1" min="0" name="environment_loudness_ratio_band0" type="float"/>
<param default="1" min="0" name="environment_loudness_ratio_band1" type="float"/>
<param default="1" min="0" name="environment_loudness_ratio_band2" type="float"/>
@ -432,6 +436,7 @@
<param default="-30" name="drc_long_term_window_upper_db_band0" type="float"/>
<param default="-30" name="drc_long_term_window_upper_db_band1" type="float"/>
<param default="-30" name="drc_long_term_window_upper_db_band2" type="float"/>
<param default="10000" min="0" name="environment_high_to_low_ms" type="int32"/>
</struct>
</module>
<module id="10000" name="Eraser">

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

File diff suppressed because it is too large Load diff

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -56,16 +56,16 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
#AudioFormatIncrement=8
[CUSTOM_ACTION_260]
CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0,PRESET:SPEAKER_MUSIC
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
CASE_4=PRIORITY:3,NUMBERS:2:0|1:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
CASE_7=PRIORITY:6,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
CASE_1=PRIORITY:0,NUMBERS:2:0|1|4:1|2:0,PRESET:SPEAKER_MUSIC
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC_LITE
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1|4:1|2:0|1,PRESET:SPEAKER_SAFE_MUSIC
CASE_4=PRIORITY:3,NUMBERS:2:0|1|4:0:0,PRESET:SPEAKER_MUSIC_THROTTLE
CASE_5=PRIORITY:4,NUMBERS:1|2|4194304:2|3:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE_LITE
CASE_6=PRIORITY:5,NUMBERS:1|4194304:0|1|4:0:0|1,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
CASE_7=PRIORITY:6,NUMBERS:2:0|1|4:1|2:1,PRESET:SPEAKER_MUSIC_RESERVED
CASE_8=PRIORITY:7,NUMBERS:2:0|1|4:0:1,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
# Action 260 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t, sound_usage_t
# - audio_devices_t : current active device
# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip
# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip, 4 - call screen
# - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
# - sound_usage_t: 0 - Music, 1 - Movie

View file

@ -0,0 +1,22 @@
{
"MitigationMethod":[
{
"Name":"AUDIO_MITIGATION",
"Module":"AUDIO",
"Trigger":["OILO1"],
"State":["LIGHT", "MEDIUM", "HEAVY", "DISABLED"],
"Condition":"BASIC"
},
{
"Name":"UNDEFINED",
"Module":"UNDEFINED",
"Trigger":["OILO1", "OILO2", "UVLO1", "UVLO2", "SMPL"],
"State":["START", "LIGHT", "MEDIUM", "HEAVY", "DISABLED"],
"Condition":"BASIC"
}
],
"MitigationConfig": {
"QuickSaveStats": 1,
"TriggerDeglitchMS": 1000
}
}

View file

@ -0,0 +1,22 @@
{
"MitigationMethod":[
{
"Name":"AUDIO_MITIGATION",
"Module":"AUDIO",
"Trigger":["OILO1"],
"State":["LIGHT", "MEDIUM", "HEAVY", "DISABLED"],
"Condition":"BASIC"
},
{
"Name":"UNDEFINED",
"Module":"UNDEFINED",
"Trigger":["OILO1", "OILO2", "UVLO1", "UVLO2", "SMPL"],
"State":["START", "LIGHT", "MEDIUM", "HEAVY", "DISABLED"],
"Condition":"BASIC"
}
],
"MitigationConfig": {
"QuickSaveStats": 1,
"TriggerDeglitchMS": 1000
}
}

View file

@ -0,0 +1,22 @@
{
"MitigationMethod":[
{
"Name":"AUDIO_MITIGATION",
"Module":"AUDIO",
"Trigger":["OILO1"],
"State":["LIGHT", "MEDIUM", "HEAVY", "DISABLED"],
"Condition":"BASIC"
},
{
"Name":"UNDEFINED",
"Module":"UNDEFINED",
"Trigger":["OILO1", "OILO2", "UVLO1", "UVLO2", "SMPL"],
"State":["START", "LIGHT", "MEDIUM", "HEAVY", "DISABLED"],
"Condition":"BASIC"
}
],
"MitigationConfig": {
"QuickSaveStats": 1,
"TriggerDeglitchMS": 1000
}
}

View file

@ -0,0 +1,36 @@
Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,HR_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,HR_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,HR_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1,HR_Dual_Chain_1
off,off,off,off,off,on,66,67,39,62,66,67,40,61,54,54,30,62,54,54,30,62
off,off,off,off,on,on,66,67,39,62,66,67,40,61,54,54,30,62,54,54,30,62
off,off,off,on,off,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
off,off,off,on,on,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
off,off,on,off,off,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
off,off,on,off,on,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
off,off,on,on,off,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
off,off,on,on,on,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
off,on,off,off,off,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
off,on,off,off,on,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
off,on,off,on,off,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
off,on,off,on,on,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
off,on,on,off,off,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
off,on,on,off,on,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
off,on,on,on,off,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
off,on,on,on,on,on,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
on,off,off,off,off,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
on,off,off,off,on,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
on,off,off,on,off,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
on,off,off,on,on,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
on,off,on,off,off,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
on,off,on,off,on,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
on,off,on,on,off,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
on,off,on,on,on,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
on,on,off,off,off,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
on,on,off,off,on,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
on,on,off,on,off,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
on,on,off,on,on,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
on,on,on,off,off,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
on,on,on,off,on,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
on,on,on,on,off,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
on,on,on,on,on,any,46,46,39,46,46,46,40,46,46,46,30,46,46,46,30,46
off,off,any,off,any,off,66,67,39,62,66,67,40,61,54,54,30,62,54,54,30,62
off,on,any,any,any,off,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
off,any,any,on,any,off,60,60,39,60,60,60,40,60,54,54,30,58,54,54,30,58
1 Head BTHotspot WIFI5Ghz HotspotVoice Cell IMU BDR_Single_Chain_0 EDR_Single_Chain_0 BLE_Single_Chain_0 HR_Single_Chain_0 BDR_Single_Chain_1 EDR_Single_Chain_1 BLE_Single_Chain_1 HR_Single_Chain_1 BDR_Dual_Chain_0 EDR_Dual_Chain_0 BLE_Dual_Chain_0 HR_Dual_Chain_0 BDR_Dual_Chain_1 EDR_Dual_Chain_1 BLE_Dual_Chain_1 HR_Dual_Chain_1
2 off off off off off on 66 67 39 62 66 67 40 61 54 54 30 62 54 54 30 62
3 off off off off on on 66 67 39 62 66 67 40 61 54 54 30 62 54 54 30 62
4 off off off on off on 60 60 39 60 60 60 40 60 54 54 30 58 54 54 30 58
5 off off off on on on 60 60 39 60 60 60 40 60 54 54 30 58 54 54 30 58
6 off off on off off on 60 60 39 60 60 60 40 60 54 54 30 58 54 54 30 58
7 off off on off on on 60 60 39 60 60 60 40 60 54 54 30 58 54 54 30 58
8 off off on on off on 60 60 39 60 60 60 40 60 54 54 30 58 54 54 30 58
9 off off on on on on 60 60 39 60 60 60 40 60 54 54 30 58 54 54 30 58
10 off on off off off on 60 60 39 60 60 60 40 60 54 54 30 58 54 54 30 58
11 off on off off on on 60 60 39 60 60 60 40 60 54 54 30 58 54 54 30 58
12 off on off on off on 60 60 39 60 60 60 40 60 54 54 30 58 54 54 30 58
13 off on off on on on 60 60 39 60 60 60 40 60 54 54 30 58 54 54 30 58
14 off on on off off on 60 60 39 60 60 60 40 60 54 54 30 58 54 54 30 58
15 off on on off on on 60 60 39 60 60 60 40 60 54 54 30 58 54 54 30 58
16 off on on on off on 60 60 39 60 60 60 40 60 54 54 30 58 54 54 30 58
17 off on on on on on 60 60 39 60 60 60 40 60 54 54 30 58 54 54 30 58
18 on off off off off any 46 46 39 46 46 46 40 46 46 46 30 46 46 46 30 46
19 on off off off on any 46 46 39 46 46 46 40 46 46 46 30 46 46 46 30 46
20 on off off on off any 46 46 39 46 46 46 40 46 46 46 30 46 46 46 30 46
21 on off off on on any 46 46 39 46 46 46 40 46 46 46 30 46 46 46 30 46
22 on off on off off any 46 46 39 46 46 46 40 46 46 46 30 46 46 46 30 46
23 on off on off on any 46 46 39 46 46 46 40 46 46 46 30 46 46 46 30 46
24 on off on on off any 46 46 39 46 46 46 40 46 46 46 30 46 46 46 30 46
25 on off on on on any 46 46 39 46 46 46 40 46 46 46 30 46 46 46 30 46
26 on on off off off any 46 46 39 46 46 46 40 46 46 46 30 46 46 46 30 46
27 on on off off on any 46 46 39 46 46 46 40 46 46 46 30 46 46 46 30 46
28 on on off on off any 46 46 39 46 46 46 40 46 46 46 30 46 46 46 30 46
29 on on off on on any 46 46 39 46 46 46 40 46 46 46 30 46 46 46 30 46
30 on on on off off any 46 46 39 46 46 46 40 46 46 46 30 46 46 46 30 46
31 on on on off on any 46 46 39 46 46 46 40 46 46 46 30 46 46 46 30 46
32 on on on on off any 46 46 39 46 46 46 40 46 46 46 30 46 46 46 30 46
33 on on on on on any 46 46 39 46 46 46 40 46 46 46 30 46 46 46 30 46
34 off off any off any off 66 67 39 62 66 67 40 61 54 54 30 62 54 54 30 62
35 off on any any any off 60 60 39 60 60 60 40 60 54 54 30 58 54 54 30 58
36 off any any on any off 60 60 39 60 60 60 40 60 54 54 30 58 54 54 30 58

View file

@ -0,0 +1,36 @@
Head,BTHotspot,WIFI5Ghz,HotspotVoice,Cell,IMU,BDR_Single_Chain_0,EDR_Single_Chain_0,BLE_Single_Chain_0,HR_Single_Chain_0,BDR_Single_Chain_1,EDR_Single_Chain_1,BLE_Single_Chain_1,HR_Single_Chain_1,BDR_Dual_Chain_0,EDR_Dual_Chain_0,BLE_Dual_Chain_0,HR_Dual_Chain_0,BDR_Dual_Chain_1,EDR_Dual_Chain_1,BLE_Dual_Chain_1,HR_Dual_Chain_1
off,off,off,off,off,on,76,68,76,76,76,68,76,76,76,68,76,76,76,68,76,76
off,off,off,off,on,on,76,68,76,76,76,68,76,76,76,68,76,76,76,68,76,76
off,off,off,on,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
off,off,off,on,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
off,off,on,off,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
off,off,on,off,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
off,off,on,on,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
off,off,on,on,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
off,on,off,off,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
off,on,off,off,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
off,on,off,on,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
off,on,off,on,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
off,on,on,off,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
off,on,on,off,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
off,on,on,on,off,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
off,on,on,on,on,on,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
on,off,off,off,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
on,off,off,off,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
on,off,off,on,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
on,off,off,on,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
on,off,on,off,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
on,off,on,off,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
on,off,on,on,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
on,off,on,on,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
on,on,off,off,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
on,on,off,off,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
on,on,off,on,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
on,on,off,on,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
on,on,on,off,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
on,on,on,off,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
on,on,on,on,off,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
on,on,on,on,on,any,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46,46
off,off,any,off,any,off,76,68,76,76,76,68,76,76,76,68,76,76,76,68,76,76
off,on,any,any,any,off,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
off,any,any,on,any,off,60,60,60,60,60,60,60,60,58,58,58,58,58,58,58,58
1 Head BTHotspot WIFI5Ghz HotspotVoice Cell IMU BDR_Single_Chain_0 EDR_Single_Chain_0 BLE_Single_Chain_0 HR_Single_Chain_0 BDR_Single_Chain_1 EDR_Single_Chain_1 BLE_Single_Chain_1 HR_Single_Chain_1 BDR_Dual_Chain_0 EDR_Dual_Chain_0 BLE_Dual_Chain_0 HR_Dual_Chain_0 BDR_Dual_Chain_1 EDR_Dual_Chain_1 BLE_Dual_Chain_1 HR_Dual_Chain_1
2 off off off off off on 76 68 76 76 76 68 76 76 76 68 76 76 76 68 76 76
3 off off off off on on 76 68 76 76 76 68 76 76 76 68 76 76 76 68 76 76
4 off off off on off on 60 60 60 60 60 60 60 60 58 58 58 58 58 58 58 58
5 off off off on on on 60 60 60 60 60 60 60 60 58 58 58 58 58 58 58 58
6 off off on off off on 60 60 60 60 60 60 60 60 58 58 58 58 58 58 58 58
7 off off on off on on 60 60 60 60 60 60 60 60 58 58 58 58 58 58 58 58
8 off off on on off on 60 60 60 60 60 60 60 60 58 58 58 58 58 58 58 58
9 off off on on on on 60 60 60 60 60 60 60 60 58 58 58 58 58 58 58 58
10 off on off off off on 60 60 60 60 60 60 60 60 58 58 58 58 58 58 58 58
11 off on off off on on 60 60 60 60 60 60 60 60 58 58 58 58 58 58 58 58
12 off on off on off on 60 60 60 60 60 60 60 60 58 58 58 58 58 58 58 58
13 off on off on on on 60 60 60 60 60 60 60 60 58 58 58 58 58 58 58 58
14 off on on off off on 60 60 60 60 60 60 60 60 58 58 58 58 58 58 58 58
15 off on on off on on 60 60 60 60 60 60 60 60 58 58 58 58 58 58 58 58
16 off on on on off on 60 60 60 60 60 60 60 60 58 58 58 58 58 58 58 58
17 off on on on on on 60 60 60 60 60 60 60 60 58 58 58 58 58 58 58 58
18 on off off off off any 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46
19 on off off off on any 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46
20 on off off on off any 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46
21 on off off on on any 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46
22 on off on off off any 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46
23 on off on off on any 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46
24 on off on on off any 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46
25 on off on on on any 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46
26 on on off off off any 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46
27 on on off off on any 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46
28 on on off on off any 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46
29 on on off on on any 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46
30 on on on off off any 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46
31 on on on off on any 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46
32 on on on on off any 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46
33 on on on on on any 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46 46
34 off off any off any off 76 68 76 76 76 68 76 76 76 68 76 76 76 68 76 76
35 off on any any any off 60 60 60 60 60 60 60 60 58 58 58 58 58 58 58 58
36 off any any on any off 60 60 60 60 60 60 60 60 58 58 58 58 58 58 58 58

Some files were not shown because too many files have changed in this diff Show more