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

Commit a0e338a0 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge eb9255f5 on remote branch 

Change-Id: I5ed5b1adee32bf8ddfec447d5d3228e90c9eaae6
parents f0c1de2d eb9255f5

configs/audio_vendor_product.mk

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ AUDIO_USE_STUB_HAL := true 
endif # TARGET_USES_QMAA_OVERRIDE_AUDIO

endif # TARGET_USES_QMAA



ifeq ($(TARGET_USES_AUDIOLITE),true)

AUDIO_USE_STUB_HAL := true

endif #ends TARGET_USES_AUDIOLITE



#MM_AUDIO product packages

MM_AUDIO += audiod

MM_AUDIO += libacdbloader

configs/bengal/bengal.mk

+70 −32
Original line number Diff line number Diff line
@@ -15,76 +15,114 @@ ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true) 
USE_CUSTOM_AUDIO_POLICY := 1

AUDIO_FEATURE_QSSI_COMPLIANCE := true

AUDIO_FEATURE_ENABLED_COMPRESS_CAPTURE := false

AUDIO_FEATURE_ENABLED_COMPRESS_INPUT := true

AUDIO_FEATURE_ENABLED_CONCURRENT_CAPTURE := true

AUDIO_FEATURE_ENABLED_COMPRESS_VOIP := false

AUDIO_FEATURE_ENABLED_DYNAMIC_ECNS := true

AUDIO_FEATURE_ENABLED_EXTN_FORMATS := true

AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER := true

AUDIO_FEATURE_ENABLED_EXTN_RESAMPLER := true

AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true

AUDIO_FEATURE_ENABLED_HDMI_SPK := true

AUDIO_FEATURE_ENABLED_PCM_OFFLOAD := true

AUDIO_FEATURE_ENABLED_PCM_OFFLOAD_24 := true

AUDIO_FEATURE_ENABLED_FLAC_OFFLOAD := true

AUDIO_FEATURE_ENABLED_VORBIS_OFFLOAD := true

AUDIO_FEATURE_ENABLED_WMA_OFFLOAD := true

AUDIO_FEATURE_ENABLED_ALAC_OFFLOAD := true

AUDIO_FEATURE_ENABLED_APE_OFFLOAD := true

AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := true

AUDIO_FEATURE_ENABLED_MPEGH_SW_DECODER := true

AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true

AUDIO_FEATURE_ENABLED_SSR := true

AUDIO_FEATURE_ENABLED_DTS_EAGLE := false

BOARD_USES_SRS_TRUEMEDIA := false

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 := true

AUDIO_FEATURE_ENABLED_A2DP_OFFLOAD := true

AUDIO_FEATURE_ENABLED_3D_AUDIO := true

AUDIO_FEATURE_ENABLED_AHAL_EXT := false

AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true

DOLBY_ENABLE := false

endif



AUDIO_FEATURE_ENABLED_DLKM := true

BOARD_SUPPORTS_SOUND_TRIGGER := true

BOARD_SUPPORTS_GCS := false

AUDIO_FEATURE_ENABLED_INSTANCE_ID := true

AUDIO_USE_DEEP_AS_PRIMARY_OUTPUT := false

AUDIO_FEATURE_ENABLED_VBAT_MONITOR := true

AUDIO_FEATURE_ENABLED_NT_PAUSE_TIMEOUT := true

AUDIO_FEATURE_ENABLED_ANC_HEADSET := true

AUDIO_FEATURE_ENABLED_CUSTOMSTEREO := true

AUDIO_FEATURE_ENABLED_FLUENCE := true

AUDIO_FEATURE_ENABLED_HDMI_EDID := true

AUDIO_FEATURE_ENABLED_HDMI_PASSTHROUGH := true

#AUDIO_FEATURE_ENABLED_KEEP_ALIVE := true

AUDIO_FEATURE_ENABLED_DISPLAY_PORT := true

AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := false

AUDIO_FEATURE_ENABLED_HFP := true

AUDIO_FEATURE_ENABLED_INCALL_MUSIC := true

AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true

AUDIO_FEATURE_ENABLED_KPI_OPTIMIZE := true

AUDIO_FEATURE_ENABLED_SPKR_PROTECTION := true

AUDIO_FEATURE_ENABLED_ACDB_LICENSE := false

AUDIO_FEATURE_ENABLED_DEV_ARBI := false

AUDIO_FEATURE_ENABLED_DYNAMIC_LOG := true

MM_AUDIO_ENABLED_FTM := true

TARGET_USES_QCOM_MM_AUDIO := true

AUDIO_FEATURE_ENABLED_SOURCE_TRACKING := true

AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true

BOARD_SUPPORTS_QAHW := false

AUDIO_FEATURE_ENABLED_RAS := true

AUDIO_FEATURE_ENABLED_SND_MONITOR := true

AUDIO_FEATURE_ENABLED_USB_BURST_MODE := true

AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true

AUDIO_FEATURE_ENABLED_BATTERY_LISTENER := true

##AUDIO_FEATURE_FLAGS



ifeq ($(TARGET_1G_DDR_RAM), true)

AUDIO_FEATURE_ENABLED_AUDIOSPHERE := false

AUDIO_FEATURE_ENABLED_3D_AUDIO := false

BOARD_SUPPORTS_SOUND_TRIGGER := false

AUDIO_FEATURE_ENABLED_HFP := false

AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := false

BOARD_SUPPORTS_OPENSOURCE_STHAL := false

AUDIO_DO_NOT_USE_OMX_CODEC := true

AUDIO_FEATURE_ENABLED_COMPRESS_INPUT := false

AUDIO_FEATURE_ENABLED_CONCURRENT_CAPTURE := false

AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER := false

AUDIO_FEATURE_ENABLED_EXTN_RESAMPLER := false

AUDIO_FEATURE_ENABLED_FM_POWER_OPT := false

AUDIO_FEATURE_ENABLED_HDMI_SPK := false

AUDIO_FEATURE_ENABLED_PCM_OFFLOAD_24 := false

AUDIO_FEATURE_ENABLED_FLAC_OFFLOAD := false

AUDIO_FEATURE_ENABLED_VORBIS_OFFLOAD := false

AUDIO_FEATURE_ENABLED_WMA_OFFLOAD := false

AUDIO_FEATURE_ENABLED_ALAC_OFFLOAD := false

AUDIO_FEATURE_ENABLED_APE_OFFLOAD := false

AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := false

AUDIO_FEATURE_ENABLED_MPEGH_SW_DECODER := false

AUDIO_FEATURE_ENABLED_PROXY_DEVICE := false

AUDIO_FEATURE_ENABLED_SSR := false

MM_AUDIO_ENABLED_SAFX := false

AUDIO_FEATURE_ENABLED_USB_TUNNEL := false

AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := false

AUDIO_FEATURE_ENABLED_ANC_HEADSET := false

AUDIO_FEATURE_ENABLED_HDMI_EDID := false

AUDIO_FEATURE_ENABLED_HDMI_PASSTHROUGH := false

AUDIO_FEATURE_ENABLED_DISPLAY_PORT := false

AUDIO_FEATURE_ENABLED_DYNAMIC_LOG := false

AUDIO_FEATURE_ENABLED_SOURCE_TRACKING := false

AUDIO_FEATURE_ENABLED_GEF_SUPPORT := false

AUDIO_FEATURE_ENABLED_USB_BURST_MODE := false

PURGE_UNUSED_MEMORY := true

else

AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true

AUDIO_FEATURE_ENABLED_3D_AUDIO := true

BOARD_SUPPORTS_SOUND_TRIGGER := true

AUDIO_FEATURE_ENABLED_HFP := true

AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true

BOARD_SUPPORTS_OPENSOURCE_STHAL := true

AUDIO_FEATURE_ENABLED_COMPRESS_INPUT := true

AUDIO_FEATURE_ENABLED_CONCURRENT_CAPTURE := true

AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER := true

AUDIO_FEATURE_ENABLED_EXTN_RESAMPLER := true

AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true

AUDIO_FEATURE_ENABLED_HDMI_SPK := true

AUDIO_FEATURE_ENABLED_PCM_OFFLOAD_24 := true

AUDIO_FEATURE_ENABLED_FLAC_OFFLOAD := true

AUDIO_FEATURE_ENABLED_VORBIS_OFFLOAD := true

AUDIO_FEATURE_ENABLED_WMA_OFFLOAD := true

AUDIO_FEATURE_ENABLED_ALAC_OFFLOAD := true

AUDIO_FEATURE_ENABLED_APE_OFFLOAD := true

AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := true

AUDIO_FEATURE_ENABLED_MPEGH_SW_DECODER := true

AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true

AUDIO_FEATURE_ENABLED_SSR := true

MM_AUDIO_ENABLED_SAFX := true

AUDIO_FEATURE_ENABLED_USB_TUNNEL := true

AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true

AUDIO_FEATURE_ENABLED_ANC_HEADSET := true

AUDIO_FEATURE_ENABLED_HDMI_EDID := true

AUDIO_FEATURE_ENABLED_HDMI_PASSTHROUGH := true

AUDIO_FEATURE_ENABLED_DISPLAY_PORT := true

AUDIO_FEATURE_ENABLED_DYNAMIC_LOG := true

AUDIO_FEATURE_ENABLED_SOURCE_TRACKING := true

AUDIO_FEATURE_ENABLED_GEF_SUPPORT := true

AUDIO_FEATURE_ENABLED_USB_BURST_MODE := true

endif



AUDIO_HARDWARE := audio.a2dp.default

AUDIO_HARDWARE += audio.usb.default

configs/lahaina/yupik_overlay/mixer_paths_yupikidprb3_overlay.xml

+5 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
<!--- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                             -->

<!--                                                                        -->

<!-- Changes from Qualcomm Innovation Center are provided under the following license:-->

<!-- Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.-->

<!-- Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved.-->

<!-- SPDX-License-Identifier: BSD-3-Clause-Clear                            -->

<mixer>

    <ctl name="TX DEC0 MUX" value="MSM_DMIC"/>
@@ -67,6 +67,10 @@ 
    <path name="low-latency-playback hdmi">

        <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia5" value="1" />

    </path>

    <path name="low-latency-playback speaker-and-hdmi">

        <path name="low-latency-playback hdmi" />

        <path name="low-latency-playback" />

    </path>

    <path name="compress-offload-playback hdmi">

        <ctl name="SEC_MI2S_RX Audio Mixer MultiMedia4" value="1" />

    </path>

configs/msm8937/msm8937.mk

+64 −25
Original line number Diff line number Diff line
@@ -7,47 +7,28 @@ ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true) 
USE_CUSTOM_AUDIO_POLICY := 1

AUDIO_FEATURE_QSSI_COMPLIANCE := true

#AUDIO_FEATURE_ENABLED_VOICE_CONCURRENCY := true

AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := true

AUDIO_FEATURE_ENABLED_COMPRESS_CAPTURE := false

AUDIO_FEATURE_ENABLED_COMPRESS_VOIP := false

AUDIO_FEATURE_ENABLED_EXTN_FORMATS := true

AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER := true

AUDIO_FEATURE_ENABLED_EXTN_RESAMPLER := true

AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true

AUDIO_FEATURE_ENABLED_HDMI_SPK := true

AUDIO_FEATURE_ENABLED_PCM_OFFLOAD := true

AUDIO_FEATURE_ENABLED_PCM_OFFLOAD_24 := true

AUDIO_FEATURE_ENABLED_FLAC_OFFLOAD := true

AUDIO_FEATURE_ENABLED_VORBIS_OFFLOAD := true

AUDIO_FEATURE_ENABLED_WMA_OFFLOAD := true

AUDIO_FEATURE_ENABLED_ALAC_OFFLOAD := true

AUDIO_FEATURE_ENABLED_APE_OFFLOAD := true

AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true

AUDIO_FEATURE_ENABLED_SSR := true

AUDIO_FEATURE_ENABLED_DTS_EAGLE := false

BOARD_USES_SRS_TRUEMEDIA := false

DTS_CODEC_M_ := true

MM_AUDIO_ENABLED_SAFX := true

AUDIO_FEATURE_ENABLED_HW_ACCELERATED_EFFECTS := false

AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := false

AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true

AUDIO_FEATURE_ENABLED_AHAL_EXT := false

AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true

DOLBY_ENABLE := false

endif



USE_XML_AUDIO_POLICY_CONF := 1

BOARD_SUPPORTS_SOUND_TRIGGER := true

AUDIO_USE_DEEP_AS_PRIMARY_OUTPUT := false

AUDIO_FEATURE_ENABLED_HIFI_AUDIO := true

AUDIO_FEATURE_ENABLED_VBAT_MONITOR := true

AUDIO_FEATURE_ENABLED_NT_PAUSE_TIMEOUT := true

AUDIO_FEATURE_ENABLED_ANC_HEADSET := true

AUDIO_FEATURE_ENABLED_CUSTOMSTEREO := true

AUDIO_FEATURE_ENABLED_FLUENCE := true

AUDIO_FEATURE_ENABLED_HDMI_EDID := true

AUDIO_FEATURE_ENABLED_EXT_HDMI := true

AUDIO_FEATURE_ENABLED_HFP := true

AUDIO_FEATURE_ENABLED_INCALL_MUSIC := true

AUDIO_FEATURE_ENABLED_MULTI_VOICE_SESSIONS := true

AUDIO_FEATURE_ENABLED_KPI_OPTIMIZE := true
@@ -56,11 +37,8 @@ AUDIO_FEATURE_ENABLED_ACDB_LICENSE := true 
AUDIO_FEATURE_ENABLED_DEV_ARBI := false

MM_AUDIO_ENABLED_FTM := true

TARGET_USES_QCOM_MM_AUDIO := true

AUDIO_FEATURE_ENABLED_SOURCE_TRACKING := true

BOARD_SUPPORTS_QAHW := false

AUDIO_FEATURE_ENABLED_DYNAMIC_LOG := true

AUDIO_FEATURE_ENABLED_SND_MONITOR := true

AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true

ifeq ($(TARGET_KERNEL_VERSION), 3.18)

    AUDIO_FEATURE_ENABLED_DLKM := false

else
@@ -71,6 +49,55 @@ AUDIO_FEATURE_ENABLED_SPLIT_A2DP := true 
endif

##AUDIO_FEATURE_FLAGS



ifeq ($(TARGET_1G_DDR_RAM), true)

    AUDIO_FEATURE_ENABLED_AUDIOSPHERE := false

    BOARD_SUPPORTS_SOUND_TRIGGER := false

    AUDIO_FEATURE_ENABLED_HFP := false

    AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := false

    AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER := false

    AUDIO_FEATURE_ENABLED_FM_POWER_OPT := false

    AUDIO_FEATURE_ENABLED_HDMI_SPK := false

    AUDIO_FEATURE_ENABLED_PCM_OFFLOAD_24 := false

    AUDIO_FEATURE_ENABLED_FLAC_OFFLOAD := false

    AUDIO_FEATURE_ENABLED_VORBIS_OFFLOAD := false

    AUDIO_FEATURE_ENABLED_WMA_OFFLOAD := false

    AUDIO_FEATURE_ENABLED_ALAC_OFFLOAD := false

    AUDIO_FEATURE_ENABLED_APE_OFFLOAD := false

    AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := false

    AUDIO_FEATURE_ENABLED_PROXY_DEVICE := false

    AUDIO_FEATURE_ENABLED_SSR := false

    MM_AUDIO_ENABLED_SAFX := false

    AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := false

    AUDIO_FEATURE_ENABLED_ANC_HEADSET := false

    AUDIO_FEATURE_ENABLED_HDMI_EDID := false

    AUDIO_FEATURE_ENABLED_DYNAMIC_LOG := false

    AUDIO_FEATURE_ENABLED_SOURCE_TRACKING := false

    PURGE_UNUSED_MEMORY := true

else

    AUDIO_FEATURE_ENABLED_AUDIOSPHERE := true

    BOARD_SUPPORTS_SOUND_TRIGGER := true

    AUDIO_FEATURE_ENABLED_HFP := true

    AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true

    AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER := true

    AUDIO_FEATURE_ENABLED_FM_POWER_OPT := true

    AUDIO_FEATURE_ENABLED_HDMI_SPK := true

    AUDIO_FEATURE_ENABLED_PCM_OFFLOAD_24 := true

    AUDIO_FEATURE_ENABLED_FLAC_OFFLOAD := true

    AUDIO_FEATURE_ENABLED_VORBIS_OFFLOAD := true

    AUDIO_FEATURE_ENABLED_WMA_OFFLOAD := true

    AUDIO_FEATURE_ENABLED_ALAC_OFFLOAD := true

    AUDIO_FEATURE_ENABLED_APE_OFFLOAD := true

    AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := true

    AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true

    AUDIO_FEATURE_ENABLED_SSR := true

    MM_AUDIO_ENABLED_SAFX := true

    AUDIO_FEATURE_ENABLED_EXTENDED_COMPRESS_FORMAT := true

    AUDIO_FEATURE_ENABLED_ANC_HEADSET := true

    AUDIO_FEATURE_ENABLED_HDMI_EDID := true

    AUDIO_FEATURE_ENABLED_DYNAMIC_LOG := true

    AUDIO_FEATURE_ENABLED_SOURCE_TRACKING := true

endif





ifneq ($(BOARD_OPENSOURCE_DIR), )

  #Audio Specific device overlays
@@ -338,9 +365,7 @@ vendor.audio.feature.external_speaker.enable=false \ 
vendor.audio.feature.external_speaker_tfa.enable=false \

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

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

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

vendor.audio.feature.hdmi_passthrough.enable=false \

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

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

vendor.audio.feature.hwdep_cal.enable=false \

vendor.audio.feature.incall_music.enable=true \
@@ -367,12 +392,21 @@ else 
PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.feature.spkr_prot.enable=true

endif



ifeq ($(TARGET_1G_DDR_RAM), true)

PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.feature.hfp.enable=false \

vendor.audio.feature.hdmi_edid.enable=false

else

PRODUCT_PROPERTY_OVERRIDES += \

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

vendor.audio.feature.hdmi_edid.enable=true

endif

# for HIDL related packages

PRODUCT_PACKAGES += \

    android.hardware.audio@2.0-service \

    android.hardware.audio@2.0-impl \

    android.hardware.audio.effect@2.0-impl \

    android.hardware.soundtrigger@2.1-impl \

    android.hardware.audio@4.0 \

    android.hardware.audio.common@4.0 \

    android.hardware.audio.common@4.0-util \
@@ -380,6 +414,11 @@ PRODUCT_PACKAGES += \ 
    android.hardware.audio.effect@4.0 \

    android.hardware.audio.effect@4.0-impl



ifneq ($(TARGET_1G_DDR_RAM), true)

    PRODUCT_PACKAGES += \

         android.hardware.soundtrigger@2.1-impl

endif



# enable audio hidl hal 5.0 for sdk rev 29 and above

ifeq ($(shell expr $(PLATFORM_SDK_VERSION) \>= 29), 1)

PRODUCT_PACKAGES += \

configs/msmnile_au/audio_platform_info.xml

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
<!-- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                          -->

<!--                                                                        -->

<!-- Changes from Qualcomm Innovation Center are provided under the following license: -->

<!-- Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. -->

<!-- Copyright (c) 2023-2024 Qualcomm Innovation Center, Inc. All rights reserved. -->

<!-- SPDX-License-Identifier: BSD-3-Clause-Clear                            -->



<audio_platform_info>
@@ -170,7 +170,7 @@ 
        <param key="mono_speaker" value="right"/>

        <!-- In the below value string, first parameter indicates size -->

        <!-- followed by perf lock options                             -->

        <param key="perf_lock_opts" value="4, 0x40400000, 0x1, 0x40C00000, 0x1"/>

        <param key="perf_lock_opts" value="2, 0x40400000, 0x1"/>

        <param key="native_audio_mode" value="src"/>

        <param key="input_mic_max_count" value="4"/>

        <param key="true_32_bit" value="true"/>