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

Snap for 9175178 from a3e4caa06f to udc-release

Browse source 
Change-Id: I355c4fded482aaa5fdce9a717f0ec09228111fb2
This commit is contained in:
Android Build Coastguard Worker 2022-10-14 05:07:56 +00:00
commit 7f13668d52
13 changed files with 140 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

2
audio/felix/audio-tables.mk
View file

@ -23,7 +23,7 @@ PRODUCT_COPY_FILES += \
device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \ device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/config/audio_policy_configuration_a2dp_offload_disabled.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration_a2dp_offload_disabled.xml \
device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \ device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/config/audio_platform_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_configuration.xml \
device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \ device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/config/sound_trigger_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sound_trigger_configuration.xml \
frameworks/av/services/audiopolicy/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml device/google/felix/audio/$(AUDIO_TABLE_FOLDER)/config/bluetooth_with_le_audio_policy_configuration_7_0.xml:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth_audio_policy_configuration_7_0.xml
# AudioEffectHAL Configuration # AudioEffectHAL Configuration
PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \

2
audio/felix/config/audio_effects.xml
View file

@ -10,6 +10,7 @@
<library name="proxy" path="libeffectproxy.so"/> <library name="proxy" path="libeffectproxy.so"/>
<library name="offload_effect" path="liboffloadeffect.so"/> <library name="offload_effect" path="liboffloadeffect.so"/>
<library name="haptic_generator" path="libhapticgenerator.so"/> <library name="haptic_generator" path="libhapticgenerator.so"/>
<library name="spatializer" path="libspatialaudio.so"/>
</libraries> </libraries>
<effects> <effects>
<effectProxy name="bassboost" library="proxy" uuid="2f0871a2-c93c-4824-9664-42eb2909f2ef"> <effectProxy name="bassboost" library="proxy" uuid="2f0871a2-c93c-4824-9664-42eb2909f2ef">
@ -51,6 +52,7 @@
<effect name="ns" library="offload_effect" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/> <effect name="ns" library="offload_effect" uuid="62ff2836-d050-43c3-9c2d-94a73dad2c64"/>
<effect name="haptic_generator" library="haptic_generator" uuid="97c4acd1-8b82-4f2f-832e-c2fe5d7a9931"/> <effect name="haptic_generator" library="haptic_generator" uuid="97c4acd1-8b82-4f2f-832e-c2fe5d7a9931"/>
<effect name="dynamics_processing" library="dynamics_processing" uuid="e0e6539b-1781-7261-676f-6d7573696340"/> <effect name="dynamics_processing" library="dynamics_processing" uuid="e0e6539b-1781-7261-676f-6d7573696340"/>
<effect name="spatializer" library="spatializer" uuid="cc4677de-ff72-11eb-9a03-0242ac130003"/>
</effects> </effects>
<postprocess> <postprocess>
</postprocess> </postprocess>

10
audio/felix/config/audio_platform_configuration.xml
View file

@ -182,7 +182,8 @@
<usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/> <usecase id="UC_DEEP_BUFFER_PLAYBACK" dev1="5" dyn_path="true" dsp_vol="false" mmap="false" period="20" period_num="4"/>
<!-- dev1: voice-call downlink dev2: voice-clal uplink --> <!-- dev1: voice-call downlink dev2: voice-clal uplink -->
<usecase id="UC_VOICE_CALL" dev1="4" dev2="11"/> <usecase id="UC_VOICE_CALL" dev1="4" dev2="11"/>
<usecase id="UC_IMMERSIVE_PLAYBACK" dev1="3"/> <!-- for output with flag AUDIO_OUTPUT_SPATIALIZER -->
<usecase id="UC_IMMERSIVE_PLAYBACK" dev1="30" dyn_path="true" dsp_vol="false" mmap="false" period="10" period_num="3"/>
<!-- for output with AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD, 4 * 128KB buffer --> <!-- for output with AUDIO_OUTPUT_FLAG_COMPRESS_OFFLOAD, 4 * 128KB buffer -->
<usecase id="UC_COMPRESSED_OFFLOAD_PLAYBACK" dev1="6" dyn_path="true" dsp_vol="true" mmap="false" period="131072" period_num="4" pre_proc_id="14"/> <usecase id="UC_COMPRESSED_OFFLOAD_PLAYBACK" dev1="6" dyn_path="true" dsp_vol="true" mmap="false" period="131072" period_num="4" pre_proc_id="14"/>
<!-- dev1: audio dev2: haptic --> <!-- dev1: audio dev2: haptic -->
@ -218,6 +219,10 @@
<be_cfg be_id="OUT_A2DP_BE_CFG" latency="180000"/> <be_cfg be_id="OUT_A2DP_BE_CFG" latency="180000"/>
</usecase> </usecase>
<usecase id="UC_IMMERSIVE_PLAYBACK" type="playback">
<be_cfg be_id="OUT_A2DP_BE_CFG" latency="100000"/>
</usecase>
<usecase id="UC_AUDIO_RECORD" type="capture"> <usecase id="UC_AUDIO_RECORD" type="capture">
<be_cfg be_id="IN_CAMCORDER_LANDSCAPE_BE_CFG" latency="160000"/> <be_cfg be_id="IN_CAMCORDER_LANDSCAPE_BE_CFG" latency="160000"/>
<be_cfg be_id="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG" latency="160000"/> <be_cfg be_id="IN_CAMCORDER_INVERT_LANDSCAPE_BE_CFG" latency="160000"/>
@ -233,6 +238,9 @@
</dsp_latency> </dsp_latency>
<soundcard_name name="google,aoc-snd-card" /> <soundcard_name name="google,aoc-snd-card" />
<features>
<feature name="BatteryThrottle=Type:BCL_VOLTAGE,Name:BCL_AUDIO_BAACL,Strategy:MediaSpeakerAndScreenOn"/>
</features>
<cfg_attr> <cfg_attr>
<cfg id="OUT_SPEAKER_BE_CFG" intf_name="TDM_RX_0" mux="HW_MUX_GP_0" tuning_id="2"/> <cfg id="OUT_SPEAKER_BE_CFG" intf_name="TDM_RX_0" mux="HW_MUX_GP_0" tuning_id="2"/>

10
audio/felix/config/audio_policy_configuration.xml
View file

@ -63,8 +63,8 @@
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_FAST AUDIO_OUTPUT_FLAG_DEEP_BUFFER"> <mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="incall playback" role="source" <mixPort name="incall playback" role="source"
@ -154,17 +154,17 @@
<devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source"> <devicePort tagName="BT SCO Headset Mic" type="AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET" role="source">
</devicePort> </devicePort>
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink" <devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink"
encodedFormats="AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</devicePort> </devicePort>
<devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink" <devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink"
encodedFormats="AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</devicePort> </devicePort>
<devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink" <devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink"
encodedFormats="AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC"> encodedFormats="AUDIO_FORMAT_OPUS AUDIO_FORMAT_AAC AUDIO_FORMAT_SBC">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="44100 48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</devicePort> </devicePort>

4
audio/felix/config/audio_policy_configuration_a2dp_offload_disabled.xml
View file

@ -63,8 +63,8 @@
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_FAST AUDIO_OUTPUT_FLAG_DEEP_BUFFER"> <mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="incall playback" role="source" <mixPort name="incall playback" role="source"

4
audio/felix/config/audio_policy_configuration_bluetooth_legacy_hal.xml
View file

@ -63,10 +63,6 @@
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/> samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort> </mixPort>
<mixPort name="immersive_out" role="source" flags="AUDIO_OUTPUT_FLAG_FAST AUDIO_OUTPUT_FLAG_DEEP_BUFFER">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="48000" channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="incall playback" role="source" <mixPort name="incall playback" role="source"
flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC"> flags="AUDIO_OUTPUT_FLAG_INCALL_MUSIC">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT" <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

71
audio/felix/config/bluetooth_with_le_audio_policy_configuration_7_0.xml Normal file
View file

@ -0,0 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Bluetooth Audio HAL Audio Policy Configuration file -->
<module name="bluetooth" halVersion="2.0">
<mixPorts>
<!-- A2DP Audio Ports -->
<mixPort name="a2dp output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER"/>
<!-- Hearing AIDs Audio Ports -->
<mixPort name="hearing aid output" role="source">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="24000 16000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<!-- Le Audio Audio Ports -->
<mixPort name="le audio output" role="source" flags="AUDIO_OUTPUT_FLAG_SPATIALIZER">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="44100 48000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</mixPort>
<mixPort name="le audio input" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
<profile name="" format="AUDIO_FORMAT_PCM_24_BIT_PACKED"
samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
<profile name="" format="AUDIO_FORMAT_PCM_32_BIT"
samplingRates="8000 16000 24000 32000 44100 48000"
channelMasks="AUDIO_CHANNEL_IN_MONO AUDIO_CHANNEL_IN_STEREO"/>
</mixPort>
</mixPorts>
<devicePorts>
<!-- A2DP Audio Ports -->
<devicePort tagName="BT A2DP Out" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="44100 48000 88200 96000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</devicePort>
<devicePort tagName="BT A2DP Headphones" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_HEADPHONES" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="44100 48000 88200 96000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</devicePort>
<devicePort tagName="BT A2DP Speaker" type="AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER" role="sink">
<profile name="" format="AUDIO_FORMAT_PCM_16_BIT"
samplingRates="44100 48000 88200 96000"
channelMasks="AUDIO_CHANNEL_OUT_STEREO"/>
</devicePort>
<!-- Hearing AIDs Audio Ports -->
<devicePort tagName="BT Hearing Aid Out" type="AUDIO_DEVICE_OUT_HEARING_AID" role="sink"/>
<!-- BLE Audio Ports -->
<devicePort tagName="BLE Headset Out" type="AUDIO_DEVICE_OUT_BLE_HEADSET" role="sink"/>
<devicePort tagName="BLE Speaker Out" type="AUDIO_DEVICE_OUT_BLE_SPEAKER" role="sink"/>
<devicePort tagName="BLE Headset In" type="AUDIO_DEVICE_IN_BLE_HEADSET" role="source"/>
</devicePorts>
<routes>
<route type="mix" sink="BT A2DP Out"
sources="a2dp output"/>
<route type="mix" sink="BT A2DP Headphones"
sources="a2dp output"/>
<route type="mix" sink="BT A2DP Speaker"
sources="a2dp output"/>
<route type="mix" sink="BT Hearing Aid Out"
sources="hearing aid output"/>
<route type="mix" sink="BLE Headset Out"
sources="le audio output"/>
<route type="mix" sink="le audio input"
sources="BLE Headset In"/>
<route type="mix" sink="BLE Speaker Out"
sources="le audio output"/>
</routes>
</module>

9
audio/felix/config/mixer_paths.xml
View file

@ -131,6 +131,7 @@
<ctl name="TDM_0_RX Mixer NoHost1" value="0"/> <ctl name="TDM_0_RX Mixer NoHost1" value="0"/>
<ctl name="TDM_0_RX Mixer VOIP" value="0"/> <ctl name="TDM_0_RX Mixer VOIP" value="0"/>
<ctl name="TDM_0_RX Mixer RAW" value="0"/> <ctl name="TDM_0_RX Mixer RAW" value="0"/>
<ctl name="TDM_0_RX Mixer IMSV" value="0"/>
<ctl name="TDM_1_RX Mixer EP1" value="0"/> <ctl name="TDM_1_RX Mixer EP1" value="0"/>
<ctl name="TDM_1_RX Mixer EP2" value="0"/> <ctl name="TDM_1_RX Mixer EP2" value="0"/>
@ -153,6 +154,7 @@
<ctl name="USB_RX Mixer VOIP" value="0"/> <ctl name="USB_RX Mixer VOIP" value="0"/>
<ctl name="USB_RX Mixer HIFI" value="0"/> <ctl name="USB_RX Mixer HIFI" value="0"/>
<ctl name="USB_RX Mixer RAW" value="0"/> <ctl name="USB_RX Mixer RAW" value="0"/>
<ctl name="USB_RX Mixer IMSV" value="0"/>
<ctl name="BT_RX Mixer EP1" value="0"/> <ctl name="BT_RX Mixer EP1" value="0"/>
<ctl name="BT_RX Mixer EP2" value="0"/> <ctl name="BT_RX Mixer EP2" value="0"/>
@ -163,6 +165,7 @@
<ctl name="BT_RX Mixer EP7" value="0"/> <ctl name="BT_RX Mixer EP7" value="0"/>
<ctl name="BT_RX Mixer NoHost1" value="0"/> <ctl name="BT_RX Mixer NoHost1" value="0"/>
<ctl name="BT_RX Mixer VOIP" value="0"/> <ctl name="BT_RX Mixer VOIP" value="0"/>
<ctl name="BT_RX Mixer IMSV" value="0"/>
<ctl name="INCALL_RX Mixer EP1" value="0"/> <ctl name="INCALL_RX Mixer EP1" value="0"/>
<ctl name="INCALL_RX Mixer EP2" value="0"/> <ctl name="INCALL_RX Mixer EP2" value="0"/>
@ -442,15 +445,15 @@
</path> </path>
<path name="immersive-playbackP"> <path name="immersive-playbackP">
<ctl name="TDM_0_RX Mixer EP4" value="1"/> <ctl name="TDM_0_RX Mixer IMSV" value="1"/>
</path> </path>
<path name="immersive-playbackP bt"> <path name="immersive-playbackP bt">
<ctl name="BT_RX Mixer EP4" value="1"/> <ctl name="BT_RX Mixer IMSV" value="1"/>
</path> </path>
<path name="immersive-playbackP usb-headphone"> <path name="immersive-playbackP usb-headphone">
<ctl name="USB_RX Mixer EP4" value="1"/> <ctl name="USB_RX Mixer IMSV" value="1"/>
</path> </path>
<path name="voip-playbackP"> <path name="voip-playbackP">

47
audio/felix/tuning/waves/waves_config.ini
View file

@ -5,7 +5,6 @@
# Putting any value other than 1 would be equivalent to not supported. # Putting any value other than 1 would be equivalent to not supported.
######################################################################################################## ########################################################################################################
[HAL_SUPPORTED_FEATURES] [HAL_SUPPORTED_FEATURES]
CUSTOM_ACTION_256=0
CUSTOM_ACTION_257=1 CUSTOM_ACTION_257=1
######################################################################################################## ########################################################################################################
@ -27,12 +26,16 @@ OST_SPEAKER = 0:12,90:13,180:12,270:0|13
# This should be configured by Waves only unless platform vendor is familiar with MPS structure. # This should be configured by Waves only unless platform vendor is familiar with MPS structure.
######################################################################################################## ########################################################################################################
[HAL_SUPPORTED_PRESETS] [HAL_SUPPORTED_PRESETS]
SPEAKER_MUSIC_UNFOLDED = OM:1,SM:2,OST:OST_SPEAKER SPEAKER_MUSIC_FOLDED_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER
SPEAKER_MUSIC_UNFOLDED_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER
SPEAKER_MUSIC_CLAMSHELL_THROTTLE= OM:1,SM:3,OST:OST_SPEAKER
SPEAKER_MUSIC_RESERVED_THROTTLE = OM:1,SM:3,OST:OST_SPEAKER
SPEAKER_SAFE_MUSIC_THROTTLE = OM:10,SM:3,OST:OST_SPEAKER
SPEAKER_MUSIC_FOLDED = OM:1,SM:2,OST:OST_SPEAKER SPEAKER_MUSIC_FOLDED = OM:1,SM:2,OST:OST_SPEAKER
SPEAKER_MUSIC = OM:1,SM:2,OST:OST_SPEAKER SPEAKER_MUSIC_UNFOLDED = OM:1,SM:2,OST:OST_SPEAKER
SPEAKER_MUSIC_CLAMSHELL = OM:1,SM:2,OST:OST_SPEAKER
SPEAKER_MUSIC_RESERVED = OM:1,SM:2,OST:OST_SPEAKER
SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER SPEAKER_SAFE_MUSIC = OM:10,SM:2,OST:OST_SPEAKER
SPEAKER_SAFE_CALL = OM:10,SM:2,OST:OST_SPEAKER
HEADSET_MUSIC = OM:2,SM:2
######################################################################################################## ########################################################################################################
# This defines available CONTROL configurations. Only define the CONTROL if you need it. # This defines available CONTROL configurations. Only define the CONTROL if you need it.
@ -40,9 +43,7 @@ HEADSET_MUSIC = OM:2,SM:2
# This can be configured by Waves or platform vendor. # This can be configured by Waves or platform vendor.
######################################################################################################## ########################################################################################################
[HAL_SUPPORTED_CONTROLS] [HAL_SUPPORTED_CONTROLS]
SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC|SPEAKER_SAFE_MUSIC|SPEAKER_SAFE_CALL SPEAKER_INSTANCE = INSTANCE:1,DEV:0,SR:SR_COMMON,PRESET:SPEAKER_MUSIC_FOLDED_THROTTLE|SPEAKER_MUSIC_UNFOLDED_THROTTLE|SPEAKER_MUSIC_CLAMSHELL_THROTTLE|SPEAKER_MUSIC_RESERVED_THROTTLE|SPEAKER_SAFE_MUSIC_THROTTLE|SPEAKER_MUSIC_FOLDED|SPEAKER_MUSIC_UNFOLDED|SPEAKER_MUSIC_CLAMSHELL|SPEAKER_MUSIC_RESERVED|SPEAKER_SAFE_MUSIC
A2DP_INSTANCE = INSTANCE:2,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
USB_HEADPHONE_INSTANCE = INSTANCE:4,DEV:0,SR:SR_COMMON,PRESET:HEADSET_MUSIC
[COEFS_CONVERTER_SETTING] [COEFS_CONVERTER_SETTING]
AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so AlgFxPath=/vendor/lib/libAlgFx_HiFi3z.so
@ -55,15 +56,23 @@ AlgFxPath64=/vendor/lib64/libAlgFx_HiFi3z.so
#AudioFormatSampleSize=4 #AudioFormatSampleSize=4
#AudioFormatIncrement=8 #AudioFormatIncrement=8
# CUSTOM_ACTION_LR_MIXED (dev/mode)
[CUSTOM_ACTION_256]
CASE_1=PRIORITY:0,NUMBERS:2:0|1,PRESET:SPEAKER_MUSIC
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4,PRESET:SPEAKER_SAFE_CALL
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1,PRESET:SPEAKER_SAFE_MUSIC
# CUSTOM_ACTION_LR_MIXED_FOLDED (dev/mode/folded)
[CUSTOM_ACTION_257] [CUSTOM_ACTION_257]
CASE_1=PRIORITY:0,NUMBERS:2:0|1:0,PRESET:SPEAKER_MUSIC_UNFOLDED CASE_1=PRIORITY:0,NUMBERS:2:0|1:1|2:0|3,PRESET:SPEAKER_MUSIC_FOLDED
CASE_2=PRIORITY:1,NUMBERS:1|2|4194304:2|3|4:0|1,PRESET:SPEAKER_SAFE_CALL CASE_2=PRIORITY:1,NUMBERS:2:0|1:1|2:1,PRESET:SPEAKER_MUSIC_CLAMSHELL
CASE_3=PRIORITY:2,NUMBERS:1|4194304:0|1:0|1,PRESET:SPEAKER_SAFE_MUSIC CASE_3=PRIORITY:2,NUMBERS:2:0|1:1|2:2,PRESET:SPEAKER_MUSIC_UNFOLDED
CASE_4=PRIORITY:3,NUMBERS:2:0|1:1,PRESET:SPEAKER_MUSIC_FOLDED CASE_4=PRIORITY:3,NUMBERS:1|2|4194304:2|3|4:1|2:0|1|2|3,PRESET:SPEAKER_SAFE_MUSIC
CASE_5=PRIORITY:4,NUMBERS:1|4194304:0|1:1|2:0|1|2|3,PRESET:SPEAKER_SAFE_MUSIC
CASE_6=PRIORITY:5,NUMBERS:2:0|1:0:0|3,PRESET:SPEAKER_MUSIC_FOLDED_THROTTLE
CASE_7=PRIORITY:6,NUMBERS:2:0|1:0:1,PRESET:SPEAKER_MUSIC_CLAMSHELL_THROTTLE
CASE_8=PRIORITY:7,NUMBERS:2:0|1:0:2,PRESET:SPEAKER_MUSIC_UNFOLDED_THROTTLE
CASE_9=PRIORITY:8,NUMBERS:1|2|4194304:2|3|4:0:0|1|2|3,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
CASE_10=PRIORITY:9,NUMBERS:1|4194304:0|1:0:0|1|2|3,PRESET:SPEAKER_SAFE_MUSIC_THROTTLE
#CASE_11=PRIORITY:10,NUMBERS:2:0|1:1|2:1|2,PRESET:SPEAKER_MUSIC_RESERVED
#CASE_12=PRIORITY:11,NUMBERS:2:0|1:0:1|2,PRESET:SPEAKER_MUSIC_RESERVED_THROTTLE
# Action 257 parameters: audio_devices_t, audio_mode_t, throttle_control_state_t, folded_type_t, sound_usage_t(optional)
# - audio_devices_t : current active device
# - audio_mode_t : 0 - normal, 1 - incoming, 2 - voice call, 3 - voip
# - throttle_control_state_t: 0 - Enabled, 1 - Disabled, 2 - Bypassed
# - folded_type_t: 0 - Close, 1 -Clamshell, 2 - Open, 3 - unknown
# - sound_usage_t(optional): 0 - Music, 1 - Movie

14
device-felix.mk
View file

@ -125,7 +125,16 @@ PRODUCT_COPY_FILES += \
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
ro.bluetooth.a2dp_offload.supported=true \ ro.bluetooth.a2dp_offload.supported=true \
persist.bluetooth.a2dp_offload.disabled=false \ persist.bluetooth.a2dp_offload.disabled=false \
persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac-opus
# Spatial Audio
PRODUCT_PACKAGES += \
libspatialaudio
# declare use of spatial audio
PRODUCT_PROPERTY_OVERRIDES += \
ro.audio.spatializer_enabled=true
# Bluetooth SAR test tool # Bluetooth SAR test tool
PRODUCT_PACKAGES_DEBUG += \ PRODUCT_PACKAGES_DEBUG += \
sar_test sar_test
@ -261,4 +270,5 @@ PRODUCT_PROPERTY_OVERRIDES += \
# Camera # Camera
PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \
persist.vendor.camera.extended_launch_boost=1 \ persist.vendor.camera.extended_launch_boost=1 \
persist.vendor.camera.raise_buf_allocation_priority=1 persist.vendor.camera.raise_buf_allocation_priority=1 \
persist.vendor.camera.debug.bypass_csi_link_crc_error=true

2
device_framework_matrix_product_felix.xml
View file

@ -1,7 +1,7 @@
<compatibility-matrix version="1.0" type="framework" level="7"> <compatibility-matrix version="1.0" type="framework" level="7">
<hal format="aidl" optional="true"> <hal format="aidl" optional="true">
<name>com.google.hardware.pixel.display</name> <name>com.google.hardware.pixel.display</name>
<version>6</version> <version>7</version>
<interface> <interface>
<name>IDisplay</name> <name>IDisplay</name>
<instance>secondary</instance> <instance>secondary</instance>

4
felix/overlay/frameworks/base/core/res/res/values/config.xml
View file

@ -42,7 +42,7 @@
<integer name="config_defaultRefreshRate">0</integer> <integer name="config_defaultRefreshRate">0</integer>
<!-- The default peak refresh rate. --> <!-- The default peak refresh rate. -->
<integer name="config_defaultPeakRefreshRate">90</integer> <integer name="config_defaultPeakRefreshRate">120</integer>
<!-- Nonlinear coefficients for maximum panel brightness of 500 nits --> <!-- Nonlinear coefficients for maximum panel brightness of 500 nits -->
<string-array name="config_reduceBrightColorsCoefficientsNonlinear"> <string-array name="config_reduceBrightColorsCoefficientsNonlinear">
@ -208,7 +208,7 @@
</integer-array> </integer-array>
<!-- default refresh rate in the zone defined by birghtness and ambient thresholds --> <!-- default refresh rate in the zone defined by birghtness and ambient thresholds -->
<integer name="config_defaultRefreshRateInZone">90</integer> <integer name="config_defaultRefreshRateInZone">120</integer>
<!-- The device states (supplied by DeviceStateManager) that should be treated as folded by the <!-- The device states (supplied by DeviceStateManager) that should be treated as folded by the
display fold controller. --> display fold controller. -->

1
fingerprint_config.mk
View file

@ -4,4 +4,5 @@ GOOGLE_CONFIG_FP_STATUS=1
FPC_CONFIG_TRUSTY_CLEAN_TA=1 FPC_CONFIG_TRUSTY_CLEAN_TA=1
else else
# Non factory build, use fingerprint AIDL version # Non factory build, use fingerprint AIDL version
GOOGLE_CONFIG_POWER_NODE=/dev/input/event1
endif endif