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

Commit 5ac9d525 authored by Vijaykumar Badiger's avatar Vijaykumar Badiger Committed by Gerrit - the friendly Code Review server
Browse files

configs: Add audio effects xml file 

VTS audio effects test cases expect the
availability of an audio_effects.xml file.
Add new audio_effects.xml as per existing
audio_effects.conf.
Fast forward config changes in msmnile.

Change-Id: I2c80a523d12f9c3f0c1763b311ba7aa0248e6657
parent 994a487d

configs/msmnile_au/audio_effects.conf

+7 −0
Original line number Diff line number Diff line
@@ -33,6 +33,9 @@ libraries { 
  loudness_enhancer {

    path /vendor/lib/soundfx/libldnhncr.so

  }

  dynamics_processing {

    path /vendor/lib/soundfx/libdynproc.so

  }

  proxy {

    path /vendor/lib/soundfx/libeffectproxy.so

  }
@@ -226,6 +229,10 @@ effects { 
    library loudness_enhancer

    uuid fa415329-2034-4bea-b5dc-5b381c8d1e2c

  }

  dynamics_processing {

    library dynamics_processing

    uuid e0e6539b-1781-7261-676f-6d7573696340

  }

  aec {

    library audio_pre_processing

    uuid 0f8d0d2a-59e5-45fe-b6e4-248c8a799109

configs/msmnile_au/audio_effects.xml

0 → 100644
+119 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!--- Copyright (c) 2018, 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    -->

<!--- met:                                                                      -->

<!---     * Redistributions of source code must retain the above copyright      -->

<!---       notice, this list of conditions and the following disclaimer.       -->

<!---     * Redistributions in binary form must reproduce the above             -->

<!---       copyright notice, this list of conditions and the following         -->

<!---       disclaimer in the documentation and/or other materials provided     -->

<!---       with the distribution.                                              -->

<!---     * Neither the name of The Linux Foundation nor the names of its       -->

<!---       contributors may be used to endorse or promote products derived     -->

<!---       from this software without specific prior written permission.       -->

<!---                                                                           -->

<!--- THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED              -->

<!--- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF      -->

<!--- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT    -->

<!--- ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS    -->

<!--- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR    -->

<!--- CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF      -->

<!--- SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR           -->

<!--- BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,     -->

<!--- WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE      -->

<!--- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN    -->

<!--- IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                             -->



<audio_effects_conf version="2.0" xmlns="http://schemas.android.com/audio/audio_effects_conf/v2_0">

    <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"/>

        <library name="loudness_enhancer" path="libldnhncr.so"/>

        <library name="dynamics_processing" path="libdynproc.so"/>

        <library name="proxy" path="libeffectproxy.so"/>

        <library name="offload_bundle" path="libqcompostprocbundle.so"/>

        <library name="audio_pre_processing" path="libqcomvoiceprocessing.so"/>

        <library name="volume_listener" path="libvolumelistener.so"/>

        <library name="audiosphere" path="libasphere.so"/>

        <library name="shoebox" path="libshoebox.so"/>

    </libraries>

    <effects>

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

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

            <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"/>

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

        </effectProxy>

        <effectProxy name="equalizer" library="proxy" uuid="c8e70ecd-48ca-456e-8a4f-0002a5d5c51b">

            <libsw library="bundle" uuid="ce772f20-847d-11df-bb17-0002a5d5c51b"/>

            <libhw library="offload_bundle" uuid="a0dac280-401c-11e3-9379-0002a5d5c51b"/>

        </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"/>

            <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"/>

            <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"/>

            <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"/>

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

        </effectProxy>

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

            <libsw library="visualizer_sw" uuid="d069d9e0-8329-11df-9168-0002a5d5c51b"/>

            <libhw library="visualizer_hw" uuid="7a8044a0-1a71-11e3-a184-0002a5d5c51b"/>

        </effectProxy>

        <effect name="downmix" library="downmix" uuid="93f04452-e4fe-41cc-91f9-e475b6d1d69f"/>

        <effect name="hw_acc" library="offload_bundle" uuid="7d1580bd-297f-4683-9239-e475b6d1d69f"/>

        <effect name="loudness_enhancer" library="loudness_enhancer" uuid="fa415329-2034-4bea-b5dc-5b381c8d1e2c"/>

        <effect name="dynamics_processing" library="dynamics_processing" uuid="e0e6539b-1781-7261-676f-6d7573696340"/>

        <effect name="aec" library="audio_pre_processing" uuid="0f8d0d2a-59e5-45fe-b6e4-248c8a799109"/>

        <effect name="ns" library="audio_pre_processing" uuid="1d97bb0b-9e2f-4403-9ae3-58c2554306f8"/>

        <effect name="music_helper" library="volume_listener" uuid="08b8b058-0590-11e5-ac71-0025b32654a0"/>

        <effect name="ring_helper" library="volume_listener" uuid="0956df94-0590-11e5-bdbe-0025b32654a0"/>

        <effect name="alarm_helper" library="volume_listener" uuid="09f303e2-0590-11e5-8fdb-0025b32654a0"/>

        <effect name="voice_helper" library="volume_listener" uuid="0ace5c08-0590-11e5-ae9e-0025b32654a0"/>

        <effect name="notification_helper" library="volume_listener" uuid="0b776dde-0590-11e5-81ba-0025b32654a0"/>

        <effect name="audiosphere" library="audiosphere" uuid="184e62ab-2d19-4364-9d1b-c0a40733866c"/>

        <effect name="shoebox" library="shoebox" uuid="1eab784c-1a36-4b2a-b7fc-e34c44cab89e"/>

    </effects>

    <postprocess>

        <stream type="music">

            <apply effect="music_helper"/>

        </stream>

        <stream type="ring">

            <apply effect="ring_helper"/>

        </stream>

        <stream type="alarm">

            <apply effect="alarm_helper"/>

        </stream>

        <stream type="voice_call">

            <apply effect="voice_helper"/>

        </stream>

        <stream type="notification">

            <apply effect="notification_helper"/>

        </stream>

    </postprocess>

    <preprocess>

        <stream type="voice_communication">

            <apply effect="aec"/>

            <apply effect="ns"/>

        </stream>

    </preprocess>

</audio_effects_conf>

configs/msmnile_au/audio_policy_configuration.xml

+5 −5
Original line number Diff line number Diff line
@@ -272,11 +272,11 @@ 
                </devicePort>

                <devicePort tagName="USB Device Out" type="AUDIO_DEVICE_OUT_USB_DEVICE" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                </devicePort>

                <devicePort tagName="USB Headset Out" type="AUDIO_DEVICE_OUT_USB_HEADSET" role="sink">

                    <profile name="" format="AUDIO_FORMAT_PCM_16_BIT"

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="AUDIO_CHANNEL_OUT_MONO,AUDIO_CHANNEL_OUT_STEREO"/>

                             samplingRates="44100,48000,64000,88200,96000,128000,176400,192000" channelMasks="dynamic"/>

                </devicePort>



                <!-- Input devices declaration, i.e. Source DEVICE PORT -->
@@ -359,11 +359,11 @@ 
                <route type="mix" sink="mmap_no_irq_in"

                       sources="Built-In Mic,Built-In Back Mic,Wired Headset Mic,USB Device In,USB Headset In"/>

                <route type="mix" sink="BT A2DP Out"

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload"/>

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>

                <route type="mix" sink="BT A2DP Headphones"

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload"/>

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>

                <route type="mix" sink="BT A2DP Speaker"

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload"/>

                       sources="primary output,deep_buffer,direct_pcm,compressed_offload,voip_rx"/>

                <route type="mix" sink="hifi_input" sources="USB Device In,USB Headset In" />

            </routes>

configs/msmnile_au/msmnile_au.mk

+26 −5
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ ifneq ($(TARGET_USES_AOSP_FOR_AUDIO), true) 
USE_CUSTOM_AUDIO_POLICY := 1

AUDIO_FEATURE_ENABLED_COMPRESS_CAPTURE := false

AUDIO_FEATURE_ENABLED_COMPRESS_VOIP := false

AUDIO_FEATURE_ENABLED_DYNAMIC_ECNS := 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
@@ -23,7 +23,7 @@ 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 := false

AUDIO_FEATURE_ENABLED_SSR := true

AUDIO_FEATURE_ENABLED_DTS_EAGLE := false

BOARD_USES_SRS_TRUEMEDIA := false

DTS_CODEC_M_ := false
@@ -65,14 +65,20 @@ BOARD_SUPPORTS_QAHW := false 
AUDIO_FEATURE_ENABLED_RAS := true

AUDIO_FEATURE_ENABLED_SND_MONITOR := true

AUDIO_FEATURE_ENABLED_DLKM := true

AUDIO_FEATURE_ENABLED_USB_BURST_MODE := false

AUDIO_FEATURE_ENABLED_SVA_MULTI_STAGE := false

AUDIO_FEATURE_ENABLED_BATTERY_LISTENER := false

##AUDIO_FEATURE_FLAGS



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

#Audio Specific device overlays

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

endif



PRODUCT_COPY_FILES += \

    hardware/qcom/audio/configs/msmnile_au/audio_output_policy.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_output_policy.conf \

    hardware/qcom/audio/configs/msmnile_au/audio_effects.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.conf \

    hardware/qcom/audio/configs/msmnile_au/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \

    hardware/qcom/audio/configs/msmnile_au/mixer_paths_adp.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths_adp.xml \

    hardware/qcom/audio/configs/msmnile_au/audio_tuning_mixer_tavil.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer_tavil.txt \

    hardware/qcom/audio/configs/msmnile_au/audio_tuning_mixer.txt:$(TARGET_COPY_OUT_VENDOR)/etc/audio_tuning_mixer.txt \
@@ -113,7 +119,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ 
ro.vendor.audio.sdk.fluencetype=none\

persist.vendor.audio.fluence.voicecall=true\

persist.vendor.audio.fluence.voicerec=false\

persist.vendor.audio.fluence.speaker=true

persist.vendor.audio.fluence.speaker=true\

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



#disable tunnel encoding

PRODUCT_PROPERTY_OVERRIDES += \
@@ -182,7 +189,7 @@ vendor.audio.flac.sw.decoder.24bit=true 


#split a2dp DSP supported encoder list

PRODUCT_PROPERTY_OVERRIDES += \

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

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



#enable software decoders for ALAC and APE

PRODUCT_PROPERTY_OVERRIDES += \
@@ -218,16 +225,30 @@ vendor.audio_hal.period_multiplier=3 
PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.adm.buffering.ms=2



#enable keytone FR

PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.hal.output.suspend.supported=false



#enable mirror-link feature

PRODUCT_PROPERTY_OVERRIDES += \

vendor.audio.enable.mirrorlink=false



#enable voicecall speaker stereo

PRODUCT_PROPERTY_OVERRIDES += \

persist.vendor.audio.voicecall.speaker.stereo=true



# 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.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 \

    android.hardware.audio@4.0-impl \

    android.hardware.audio.effect@4.0 \

    android.hardware.audio.effect@4.0-impl



PRODUCT_PROPERTY_OVERRIDES += \

persist.audio.calfile0=/vendor/etc/acdbdata/adsp_avs_config.acdb\

configs/msmnile_au/sound_trigger_mixer_paths_wcd9340.xml

+7 −0
Original line number Diff line number Diff line
@@ -348,4 +348,11 @@ 
        <ctl name="EC Reference SampleRate" value="48000"/>

    </path>



    <path name="echo-reference a2dp">

        <ctl name="AUDIO_REF_EC_UL1 MUX" value="SLIM_7_RX"/>

        <ctl name="EC Reference Channels" value="Two"/>

        <ctl name="EC Reference Bit Format" value="S16_LE"/>

        <ctl name="EC Reference SampleRate" value="48000"/>

    </path>



</mixer>