Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a724f921 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "configs: update missing configs affected from QCV changes"

parents 074fd476 8a69fd46

configs/lito/audio_platform_info.xml

+4 −4
Original line number Diff line number Diff line
@@ -211,8 +211,8 @@ 
        <device name="SND_DEVICE_IN_VOICE_REC_DMIC_FLUENCE" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_AANC_HANDSET_MIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_QUAD_MIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_STEREO_DMIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_STEREO_DMIC" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_HANDSET_DMIC_STEREO" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_SPEAKER_DMIC_STEREO" interface="TX_CDC_DMA_TX_3"/>

        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK" interface="WSA_CDC_DMA_TX_0"/>

        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK_MONO_1" interface="WSA_CDC_DMA_TX_0"/>

        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK_MONO_2" interface="WSA_CDC_DMA_TX_0"/>
@@ -425,13 +425,13 @@ 
                        <mic_info mic_device_id="builtin_mic_4"

                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>

                    </snd_dev>

                    <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_STEREO_DMIC">

                    <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_DMIC_STEREO">

                        <mic_info mic_device_id="builtin_mic_1"

                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>

                        <mic_info mic_device_id="builtin_mic_2"

                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>

                    </snd_dev>

                    <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_STEREO_DMIC">

                    <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_DMIC_STEREO">

                        <mic_info mic_device_id="builtin_mic_1"

                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>

                        <mic_info mic_device_id="builtin_mic_2"

configs/trinket/audio_platform_info.xml

+2 −2
Original line number Diff line number Diff line
@@ -329,13 +329,13 @@ 
                        <mic_info mic_device_id="builtin_mic_4"

                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>

                    </snd_dev>

                    <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_STEREO_DMIC">

                    <snd_dev in_snd_device="SND_DEVICE_IN_HANDSET_DMIC_STEREO">

                        <mic_info mic_device_id="builtin_mic_1"

                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>

                        <mic_info mic_device_id="builtin_mic_2"

                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>

                    </snd_dev>

                    <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_STEREO_DMIC">

                    <snd_dev in_snd_device="SND_DEVICE_IN_SPEAKER_DMIC_STEREO">

                        <mic_info mic_device_id="builtin_mic_1"

                            channel_mapping="AUDIO_MICROPHONE_CHANNEL_MAPPING_PROCESSED"/>

                        <mic_info mic_device_id="builtin_mic_2"

configs/trinket/trinket.mk

+24 −4
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ DTS_CODEC_M_ := false 
MM_AUDIO_ENABLED_SAFX := true

AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false

AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true

AUDIO_FEATURE_ENABLED_USB_TUNNEL_AUDIO := true

AUDIO_FEATURE_ENABLED_SPLIT_A2DP := true

AUDIO_FEATURE_ENABLED_USB_TUNNEL := true

AUDIO_FEATURE_ENABLED_A2DP_OFFLOAD := true

AUDIO_FEATURE_ENABLED_3D_AUDIO := false

DOLBY_ENABLE := false

endif
@@ -40,7 +40,7 @@ USE_XML_AUDIO_POLICY_CONF := 1 
AUDIO_FEATURE_ENABLED_DLKM := true

BOARD_SUPPORTS_SOUND_TRIGGER := true

AUDIO_FEATURE_ENABLED_INSTANCE_ID := true

AUDIO_USE_LL_AS_PRIMARY_OUTPUT := true

AUDIO_USE_DEEP_AS_PRIMARY_OUTPUT := false

AUDIO_FEATURE_ENABLED_VBAT_MONITOR := true

AUDIO_FEATURE_ENABLED_ANC_HEADSET := true

AUDIO_FEATURE_ENABLED_CUSTOMSTEREO := true
@@ -71,7 +71,7 @@ AUDIO_FEATURE_ENABLED_USB_BURST_MODE := true 
##AUDIO_FEATURE_FLAGS



#Audio Specific device overlays

DEVICE_PACKAGE_OVERLAYS += hardware/qcom/audio/configs/common/overlay

DEVICE_PACKAGE_OVERLAYS += vendor/qcom/opensource/audio-hal/primary-hal/configs/common/overlay



PRODUCT_COPY_FILES += \

    vendor/qcom/opensource/audio-hal/primary-hal/configs/trinket/audio_io_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_io_policy.conf \
@@ -201,6 +201,18 @@ vendor.audio.flac.sw.decoder.24bit=true 
PRODUCT_PROPERTY_OVERRIDES += \

persist.vendor.bt.a2dp_offload_cap=sbc-aptx-aptxtws-aptxhd-aac



# A2DP offload support

PRODUCT_PROPERTY_OVERRIDES += \

ro.bluetooth.a2dp_offload.supported=true



# Disable A2DP offload

PRODUCT_PROPERTY_OVERRIDES += \

persist.bluetooth.a2dp_offload.disabled=false



# A2DP offload DSP supported encoder list

PRODUCT_PROPERTY_OVERRIDES += \

persist.bluetooth.a2dp_offload.cap=sbc-aac-aptx-aptxhd-ldac



#enable software decoders for ALAC and APE

PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.use.sw.alac.decoder=true
@@ -239,6 +251,14 @@ vendor.audio.adm.buffering.ms=2 
PRODUCT_PROPERTY_OVERRIDES += \

persist.vendor.bt.aac_frm_ctl.enabled=true



#enable headset calibration

PRODUCT_PROPERTY_OVERRIDES += \

audio.volume.headset.gain.depcal=true



#enable dualmic fluence for voice communication

PRODUCT_PROPERTY_OVERRIDES += \

persist.audio.fluence.voicecomm=true



#add dynamic feature flags here

PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.feature.a2dp_offload.enable=true \