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

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

Merge 904342b6 on remote branch 

Change-Id: I4938b96427f0a3727f0094dfaec024063594bc52
parents 0fd03cad 904342b6

configs/msm8937/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, 2020 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"/>
@@ -44,11 +41,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">
@@ -57,19 +54,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/msm8937/audio_platform_info_intcodec.xml

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
        <usecase name="USECASE_VOICEMMODE2_CALL" type="out" id="35"/>

        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="1" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK2" type="out" id="35" />

        <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="26"/>

    </pcm_ids>

    <config_params>

        <param key="spkr_1_tz_name" value="wsa881x.0f"/>

configs/msm8937/msm8937.mk

+6 −1
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_platform_info 
vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_platform_info_tashalite.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_tashalite.xml \

vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_platform_info_tasha.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_tasha.xml \

vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_platform_info_mtp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info_mtp.xml \

vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \

vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \

vendor/qcom/opensource/audio-hal/primary-hal/configs/msm8937/audio_configs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_configs.xml
@@ -226,7 +227,7 @@ vendor.audio.flac.sw.decoder.24bit=true 


#timeout crash duration set to 20sec before system is ready.

#timeout duration updates to default timeout of 5sec once the system is ready.

PRODUCT_PRODUCT_PROPERTIES += \

PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.hal.boot.timeout.ms=20000



#Set AudioFlinger client heap size
@@ -243,6 +244,10 @@ persist.vendor.bt.enable.splita2dp=false 
PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.volume.headset.gain.depcal=true



#Set speaker protection cal tx path sampling rate to 48k

PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.spkr_prot.tx.sampling_rate=48000



#add dynamic feature flags here

PRODUCT_PROPERTY_OVERRIDES += \

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

configs/msm8953/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, 2020 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"/>
@@ -44,11 +41,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">
@@ -57,19 +54,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/msm8953/audio_platform_info_intcodec.xml

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
        <usecase name="USECASE_VOICEMMODE2_CALL" type="out" id="35"/>

        <usecase name="USECASE_INCALL_MUSIC_UPLINK" type="out" id="1" />

        <usecase name="USECASE_INCALL_MUSIC_UPLINK2" type="out" id="35" />

        <usecase name="USECASE_AUDIO_SPKR_CALIB_TX" type="in" id="26"/>

    </pcm_ids>

    <config_params>

        <param key="spkr_1_tz_name" value="wsa881x.0f"/>