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

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

Merge ad672adc on remote branch 

Change-Id: I90904865da27912c0d9a5a30c004943cd4f086a8
parents 82e8be53 ad672adc

configs/atoll/atoll.mk

+94 −0
Original line number Diff line number Diff line
@@ -69,6 +69,87 @@ AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true 
AUDIO_FEATURE_ENABLED_BATTERY_LISTENER := true

##AUDIO_FEATURE_FLAGS



AUDIO_HARDWARE := audio.a2dp.default

AUDIO_HARDWARE += audio.usb.default

AUDIO_HARDWARE += audio.r_submix.default

AUDIO_HARDWARE += audio.primary.atoll



#HAL Wrapper

AUDIO_WRAPPER := libqahw

AUDIO_WRAPPER += libqahwwrapper



#HAL Test app

AUDIO_HAL_TEST_APPS := hal_play_test

AUDIO_HAL_TEST_APPS += hal_rec_test



PRODUCT_PACKAGES += $(AUDIO_HARDWARE)

PRODUCT_PACKAGES += $(AUDIO_WRAPPER)

PRODUCT_PACKAGES += $(AUDIO_HAL_TEST_APPS)



ifeq ($(AUDIO_FEATURE_ENABLED_DLKM),true)

BOARD_VENDOR_KERNEL_MODULES := \

    $(KERNEL_MODULES_OUT)/audio_apr.ko \

    $(KERNEL_MODULES_OUT)/audio_q6_pdr.ko \

    $(KERNEL_MODULES_OUT)/audio_q6_notifier.ko \

    $(KERNEL_MODULES_OUT)/audio_adsp_loader.ko \

    $(KERNEL_MODULES_OUT)/audio_q6.ko \

    $(KERNEL_MODULES_OUT)/audio_usf.ko \

    $(KERNEL_MODULES_OUT)/audio_pinctrl_lpi.ko \

    $(KERNEL_MODULES_OUT)/audio_swr.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd_core.ko \

    $(KERNEL_MODULES_OUT)/audio_swr_ctrl.ko \

    $(KERNEL_MODULES_OUT)/audio_wsa881x.ko \

    $(KERNEL_MODULES_OUT)/audio_platform.ko \

    $(KERNEL_MODULES_OUT)/audio_hdmi.ko \

    $(KERNEL_MODULES_OUT)/audio_stub.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd9xxx.ko \

    $(KERNEL_MODULES_OUT)/audio_mbhc.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd938x.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd938x_slave.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd937x.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd937x_slave.ko \

    $(KERNEL_MODULES_OUT)/audio_bolero_cdc.ko \

    $(KERNEL_MODULES_OUT)/audio_wsa_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_va_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_rx_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_tx_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_native.ko \

    $(KERNEL_MODULES_OUT)/audio_machine_atoll.ko \

    $(KERNEL_MODULES_OUT)/audio_snd_event.ko

endif



#Audio DLKM

AUDIO_DLKM := audio_apr.ko

AUDIO_DLKM += audio_q6_pdr.ko

AUDIO_DLKM += audio_q6_notifier.ko

AUDIO_DLKM += audio_adsp_loader.ko

AUDIO_DLKM += audio_q6.ko

AUDIO_DLKM += audio_usf.ko

AUDIO_DLKM += audio_pinctrl_wcd.ko

AUDIO_DLKM += audio_swr.ko

AUDIO_DLKM += audio_wcd_core.ko

AUDIO_DLKM += audio_swr_ctrl.ko

AUDIO_DLKM += audio_wsa881x.ko

AUDIO_DLKM += audio_platform.ko

AUDIO_DLKM += audio_hdmi.ko

AUDIO_DLKM += audio_stub.ko

AUDIO_DLKM += audio_wcd9xxx.ko

AUDIO_DLKM += audio_mbhc.ko

AUDIO_DLKM += audio_native.ko

AUDIO_DLKM += audio_wcd938x.ko

AUDIO_DLKM += audio_wcd938x_slave.ko

AUDIO_DLKM += audio_wcd937x.ko

AUDIO_DLKM += audio_wcd937x_slave.ko

AUDIO_DLKM += audio_bolero_cdc.ko

AUDIO_DLKM += audio_wsa_macro.ko

AUDIO_DLKM += audio_va_macro.ko

AUDIO_DLKM += audio_rx_macro.ko

AUDIO_DLKM += audio_tx_macro.ko

AUDIO_DLKM += audio_machine_atoll.ko

AUDIO_DLKM += audio_snd_event.ko



PRODUCT_PACKAGES += $(AUDIO_DLKM)



#Audio Specific device overlays

DEVICE_PACKAGE_OVERLAYS += vendor/qcom/opensource/audio-hal/primary-hal/configs/common/overlay
@@ -115,6 +196,19 @@ persist.vendor.audio.fluence.voicecall=true\ 
persist.vendor.audio.fluence.voicerec=false\

persist.vendor.audio.fluence.speaker=true



#

#snapdragon value add features

#

PRODUCT_PROPERTY_OVERRIDES += \

ro.qc.sdk.audio.ssr=false



##fluencetype can be "fluence" or "fluencepro" or "none"

PRODUCT_PROPERTY_OVERRIDES += \

ro.qc.sdk.audio.fluencetype=none\

persist.audio.fluence.voicecall=true\

persist.audio.fluence.voicerec=false\

persist.audio.fluence.speaker=true



##speaker protection v3 switch and ADSP AFE API version

PRODUCT_PROPERTY_OVERRIDES += \

persist.vendor.audio.spv3.enable=true\

configs/kona/audio_effects.xml

+7 −10
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!--- Copyright (c) 2018, The Linux Foundation. All rights reserved.            -->

<!--- Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.            -->

<!---                                                                           -->

<!--- Redistribution and use in source and binary forms, with or without        -->

<!--- modification, are permitted provided that the following conditions are    -->
@@ -30,9 +30,6 @@ 
    <libraries>

        <library name="bundle" path="libbundlewrapper.so"/>

        <library name="reverb" path="libreverbwrapper.so"/>

        <library name="qcbassboost" path="libqcbassboost.so"/>

        <library name="qcvirt" path="libqcvirt.so"/>

        <library name="qcreverb" path="libqcreverb.so"/>

        <library name="visualizer_sw" path="libvisualizer.so"/>

        <library name="visualizer_hw" path="libqcomvisualizer.so"/>

        <library name="downmix" path="libdownmix.so"/>
@@ -47,11 +44,11 @@ 
    </libraries>

    <effects>

        <effectProxy name="bassboost" library="proxy" uuid="14804144-a5ee-4d24-aa88-0002a5d5c51b">

            <libsw library="qcbassboost" uuid="23aca180-44bd-11e2-bcfd-0800200c9a66"/>

            <libsw library="bundle" uuid="8631f300-72e2-11df-b57e-0002a5d5c51b"/>

            <libhw library="offload_bundle" uuid="2c4a8c24-1581-487f-94f6-0002a5d5c51b"/>

        </effectProxy>

        <effectProxy name="virtualizer" library="proxy" uuid="d3467faa-acc7-4d34-acaf-0002a5d5c51b">

            <libsw library="qcvirt" uuid="e6c98a16-22a3-11e2-b87b-f23c91aec05e"/>

            <libsw library="bundle" uuid="1d4033c0-8557-11df-9f2d-0002a5d5c51b"/>

            <libhw library="offload_bundle" uuid="509a4498-561a-4bea-b3b1-0002a5d5c51b"/>

        </effectProxy>

        <effectProxy name="equalizer" library="proxy" uuid="c8e70ecd-48ca-456e-8a4f-0002a5d5c51b">
@@ -60,19 +57,19 @@ 
        </effectProxy>

        <effect name="volume" library="bundle" uuid="119341a0-8469-11df-81f9-0002a5d5c51b"/>

        <effectProxy name="reverb_env_aux" library="proxy" uuid="48404ac9-d202-4ccc-bf84-0002a5d5c51b">

            <libsw library="qcreverb" uuid="a8c1e5f3-293d-43cd-95ec-d5e26c02e217"/>

            <libsw library="reverb" uuid="4a387fc0-8ab3-11df-8bad-0002a5d5c51b"/>

            <libhw library="offload_bundle" uuid="79a18026-18fd-4185-8233-0002a5d5c51b"/>

        </effectProxy>

        <effectProxy name="reverb_env_ins" library="proxy" uuid="b707403a-a1c1-4291-9573-0002a5d5c51b">

            <libsw library="qcreverb" uuid="791fff8b-8129-4655-83a4-59bc61034c3a"/>

            <libsw library="reverb" uuid="c7a511a0-a3bb-11df-860e-0002a5d5c51b"/>

            <libhw library="offload_bundle" uuid="eb64ea04-973b-43d2-8f5e-0002a5d5c51b"/>

        </effectProxy>

        <effectProxy name="reverb_pre_aux" library="proxy" uuid="1b78f587-6d1c-422e-8b84-0002a5d5c51b">

            <libsw library="qcreverb" uuid="53ef1db5-c0c0-445b-b060-e34d20ebb70a"/>

            <libsw library="reverb" uuid="f29a1400-a3bb-11df-8ddc-0002a5d5c51b"/>

            <libhw library="offload_bundle" uuid="6987be09-b142-4b41-9056-0002a5d5c51b"/>

        </effectProxy>

        <effectProxy name="reverb_pre_ins" library="proxy" uuid="f3e178d2-ebcb-408e-8357-0002a5d5c51b">

            <libsw library="qcreverb" uuid="b08a0e38-22a5-11e2-b87b-f23c91aec05e"/>

            <libsw library="reverb" uuid="172cdf00-a3bc-11df-a72f-0002a5d5c51b"/>

            <libhw library="offload_bundle" uuid="aa2bebf6-47cf-4613-9bca-0002a5d5c51b"/>

        </effectProxy>

        <effectProxy name="visualizer" library="proxy" uuid="1d0a1a53-7d5d-48f2-8e71-27fbd10d842c">

configs/kona/audio_platform_info_intcodec.xml

+8 −1
Original line number Diff line number Diff line
@@ -106,6 +106,13 @@ 
        <param key="hfp_pcm_dev_id" value="39"/>

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

    </config_params>

    <gain_db_to_level_mapping>

        <gain_level_map db="-59" level="5"/>

        <gain_level_map db="-17.4" level="4"/>

        <gain_level_map db="-13.8" level="3"/>

        <gain_level_map db="-10.2" level="2"/>

        <gain_level_map db="0" level="1"/>

    </gain_db_to_level_mapping>

    <acdb_ids>

        <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="15"/>

        <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" acdb_id="15"/>
@@ -128,7 +135,7 @@ 
        <device name="SND_DEVICE_IN_UNPROCESSED_THREE_MIC" acdb_id="145"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_QUAD_MIC" acdb_id="146"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" acdb_id="147"/>

        <device name="SND_DEVICE_IN_HANDSET_GENERIC_QMIC" acdb_id="157"/>

        <device name="SND_DEVICE_IN_HANDSET_GENERIC_QMIC" acdb_id="191"/>

    </acdb_ids>

    <backend_names>

        <device name="SND_DEVICE_OUT_HEADPHONES" backend="headphones" interface="RX_CDC_DMA_RX_0"/>

configs/kona/audio_platform_info_qrd.xml

+8 −1
Original line number Diff line number Diff line
@@ -103,6 +103,13 @@ 
        <param key="hfp_pcm_dev_id" value="39"/>

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

    </config_params>

    <gain_db_to_level_mapping>

        <gain_level_map db="-59" level="5"/>

        <gain_level_map db="-17.4" level="4"/>

        <gain_level_map db="-13.8" level="3"/>

        <gain_level_map db="-10.2" level="2"/>

        <gain_level_map db="0" level="1"/>

    </gain_db_to_level_mapping>

    <acdb_ids>

        <device name="SND_DEVICE_OUT_SPEAKER" acdb_id="15"/>

        <device name="SND_DEVICE_OUT_SPEAKER_REVERSE" acdb_id="15"/>
@@ -125,7 +132,7 @@ 
        <device name="SND_DEVICE_IN_UNPROCESSED_THREE_MIC" acdb_id="145"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_QUAD_MIC" acdb_id="146"/>

        <device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" acdb_id="147"/>

        <device name="SND_DEVICE_IN_HANDSET_GENERIC_QMIC" acdb_id="157"/>

        <device name="SND_DEVICE_IN_HANDSET_GENERIC_QMIC" acdb_id="191"/>

    </acdb_ids>

    <module_ids>

        <aec>

configs/kona/kona.mk

+98 −1
Original line number Diff line number Diff line
@@ -81,6 +81,90 @@ AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := true 
AUDIO_FEATURE_ENABLED_BATTERY_LISTENER := true

##AUDIO_FEATURE_FLAGS



#Compile opensource sthal and disable compiling of proprietary sthal

BOARD_SUPPORTS_OPENSOURCE_STHAL := true



AUDIO_HARDWARE := audio.a2dp.default

AUDIO_HARDWARE += audio.usb.default

AUDIO_HARDWARE += audio.r_submix.default

AUDIO_HARDWARE += audio.primary.kona



#HAL Wrapper

AUDIO_WRAPPER := libqahw

AUDIO_WRAPPER += libqahwwrapper



#HAL Test app

AUDIO_HAL_TEST_APPS := hal_play_test

AUDIO_HAL_TEST_APPS += hal_rec_test



PRODUCT_PACKAGES += $(AUDIO_HARDWARE)

PRODUCT_PACKAGES += $(AUDIO_WRAPPER)

PRODUCT_PACKAGES += $(AUDIO_HAL_TEST_APPS)



ifeq ($(AUDIO_FEATURE_ENABLED_DLKM),true)

BOARD_VENDOR_KERNEL_MODULES := \

    $(KERNEL_MODULES_OUT)/audio_apr.ko \

    $(KERNEL_MODULES_OUT)/audio_q6_pdr.ko \

    $(KERNEL_MODULES_OUT)/audio_q6_notifier.ko \

    $(KERNEL_MODULES_OUT)/audio_adsp_loader.ko \

    $(KERNEL_MODULES_OUT)/audio_q6.ko \

    $(KERNEL_MODULES_OUT)/audio_usf.ko \

    $(KERNEL_MODULES_OUT)/audio_pinctrl_wcd.ko \

    $(KERNEL_MODULES_OUT)/audio_pinctrl_lpi.ko \

    $(KERNEL_MODULES_OUT)/audio_swr.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd_core.ko \

    $(KERNEL_MODULES_OUT)/audio_swr_ctrl.ko \

    $(KERNEL_MODULES_OUT)/audio_wsa881x.ko \

    $(KERNEL_MODULES_OUT)/audio_platform.ko \

    $(KERNEL_MODULES_OUT)/audio_hdmi.ko \

    $(KERNEL_MODULES_OUT)/audio_stub.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd9xxx.ko \

    $(KERNEL_MODULES_OUT)/audio_mbhc.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd938x.ko \

    $(KERNEL_MODULES_OUT)/audio_wcd938x_slave.ko \

    $(KERNEL_MODULES_OUT)/audio_bolero_cdc.ko \

    $(KERNEL_MODULES_OUT)/audio_wsa_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_va_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_rx_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_tx_macro.ko \

    $(KERNEL_MODULES_OUT)/audio_native.ko \

    $(KERNEL_MODULES_OUT)/audio_machine_kona.ko \

    $(KERNEL_MODULES_OUT)/audio_snd_event.ko

endif



BOARD_VENDOR_KERNEL_MODULES += \

    $(KERNEL_MODULES_OUT)/qca_cld3_wlan.ko



#Audio DLKM

AUDIO_DLKM := audio_apr.ko

AUDIO_DLKM += audio_q6_pdr.ko

AUDIO_DLKM += audio_q6_notifier.ko

AUDIO_DLKM += audio_adsp_loader.ko

AUDIO_DLKM += audio_q6.ko

AUDIO_DLKM += audio_usf.ko

AUDIO_DLKM += audio_pinctrl_wcd.ko

AUDIO_DLKM += audio_swr.ko

AUDIO_DLKM += audio_wcd_core.ko

AUDIO_DLKM += audio_swr_ctrl.ko

AUDIO_DLKM += audio_wsa881x.ko

AUDIO_DLKM += audio_platform.ko

AUDIO_DLKM += audio_hdmi.ko

AUDIO_DLKM += audio_stub.ko

AUDIO_DLKM += audio_wcd9xxx.ko

AUDIO_DLKM += audio_mbhc.ko

AUDIO_DLKM += audio_native.ko

AUDIO_DLKM += audio_wcd938x.ko

AUDIO_DLKM += audio_wcd938x_slave.ko

AUDIO_DLKM += audio_bolero_cdc.ko

AUDIO_DLKM += audio_wsa_macro.ko

AUDIO_DLKM += audio_va_macro.ko

AUDIO_DLKM += audio_rx_macro.ko

AUDIO_DLKM += audio_tx_macro.ko

AUDIO_DLKM += audio_machine_kona.ko

AUDIO_DLKM += audio_snd_event.ko



PRODUCT_PACKAGES += $(AUDIO_DLKM)



ifneq ($(strip $(TARGET_USES_RRO)), true)

#Audio Specific device overlays

DEVICE_PACKAGE_OVERLAYS += vendor/qcom/opensource/audio-hal/primary-hal/configs/common/overlay
@@ -132,6 +216,19 @@ persist.vendor.audio.fluence.voicerec=false\ 
persist.vendor.audio.fluence.speaker=true\

persist.vendor.audio.fluence.tmic.enabled=false



#

#snapdragon value add features

#

PRODUCT_PROPERTY_OVERRIDES += \

ro.qc.sdk.audio.ssr=false



##fluencetype can be "fluence" or "fluencepro" or "none"

PRODUCT_PROPERTY_OVERRIDES += \

ro.qc.sdk.audio.fluencetype=none\

persist.audio.fluence.voicecall=true\

persist.audio.fluence.voicerec=false\

persist.audio.fluence.speaker=true



##speaker protection v3 switch and ADSP AFE API version

PRODUCT_PROPERTY_OVERRIDES += \

persist.vendor.audio.spv3.enable=true\
@@ -298,7 +395,7 @@ vendor.audio.feature.compr_cap.enable=false \ 
vendor.audio.feature.compress_in.enable=true \

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

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

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

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

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

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

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