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

Commit 32b7ca0f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "hal: Add dynamic enablement of AEC/NS for VoIP"

parents 8c650932 df59cae1

configs/sdm670/audio_platform_info.xml

+18 −0
Original line number Diff line number Diff line
@@ -41,6 +41,24 @@ 
        <device name="SND_DEVICE_OUT_SPEAKER_AND_HEADPHONES_EXTERNAL_2" acdb_id="10"/>

        <device name="SND_DEVICE_OUT_SPEAKER_AND_USB_HEADSET" acdb_id="45"/>

    </acdb_ids>

    <module_ids>

        <aec>

            <device name="SND_DEVICE_IN_SPEAKER_QMIC_AEC_NS" module_id="0x10F17" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>

            <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS_BROADSIDE" module_id="0x10F18" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>

            <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS" module_id="0x10F0A" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>

            <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC_NS" module_id="0x10F09" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>

            <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS" module_id="0x10F0A" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>

            <device name="SND_DEVICE_IN_HANDSET_MIC_AEC_NS" module_id="0x10F09" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>

        </aec>

        <ns>

            <device name="SND_DEVICE_IN_SPEAKER_QMIC_AEC_NS" module_id="0x10F17" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>

            <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS_BROADSIDE" module_id="0x10F18" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>

            <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS" module_id="0x10F0A" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>

            <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC_NS" module_id="0x10F09" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>

            <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS" module_id="0x10F0A" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>

            <device name="SND_DEVICE_IN_HANDSET_MIC_AEC_NS" module_id="0x10F09" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>

        </ns>

    </module_ids>

    <bit_width_configs>

        <device name="SND_DEVICE_OUT_SPEAKER" bit_width="24"/>

    </bit_width_configs>

configs/sdm670/sdm670.mk

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

AUDIO_FEATURE_ENABLED_COMPRESS_CAPTURE := false

AUDIO_FEATURE_ENABLED_COMPRESS_VOIP := true

AUDIO_FEATURE_ENABLED_DYNAMIC_ECNS := false

AUDIO_FEATURE_ENABLED_EXTN_FORMATS := true

AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER := true

AUDIO_FEATURE_ENABLED_EXTN_RESAMPLER := true

configs/sdm845/audio_platform_info.xml

+20 −0
Original line number Diff line number Diff line
@@ -37,6 +37,26 @@ 
        <device name="SND_DEVICE_IN_CAPTURE_VI_FEEDBACK_MONO_2" acdb_id="152"/>

	<device name="SND_DEVICE_IN_UNPROCESSED_USB_HEADSET_MIC" acdb_id="133"/>

    </acdb_ids>



    <module_ids>

        <aec>

            <device name="SND_DEVICE_IN_SPEAKER_QMIC_AEC_NS" module_id="0x10F17" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>

            <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS_BROADSIDE" module_id="0x10F18" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>

            <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS" module_id="0x10F0A" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>

            <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC_NS" module_id="0x10F09" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>

            <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS" module_id="0x10F0A" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>

            <device name="SND_DEVICE_IN_HANDSET_MIC_AEC_NS" module_id="0x10F09" instance_id="0x0" param_id="0x10EAF" param_value="0x01"/>

        </aec>

        <ns>

            <device name="SND_DEVICE_IN_SPEAKER_QMIC_AEC_NS" module_id="0x10F17" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>

            <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS_BROADSIDE" module_id="0x10F18" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>

            <device name="SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS" module_id="0x10F0A" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>

            <device name="SND_DEVICE_IN_SPEAKER_MIC_AEC_NS" module_id="0x10F09" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>

            <device name="SND_DEVICE_IN_HANDSET_DMIC_AEC_NS" module_id="0x10F0A" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>

            <device name="SND_DEVICE_IN_HANDSET_MIC_AEC_NS" module_id="0x10F09" instance_id="0x0" param_id="0x10EAF" param_value="0x02"/>

        </ns>

    </module_ids>



    <bit_width_configs>

        <device name="SND_DEVICE_OUT_SPEAKER" bit_width="24"/>

    </bit_width_configs>

configs/sdm845/sdm845.mk

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,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_EXTN_FORMATS := true

AUDIO_FEATURE_ENABLED_EXTN_FLAC_DECODER := true

AUDIO_FEATURE_ENABLED_EXTN_RESAMPLER := true

hal/Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -368,6 +368,10 @@ ifeq ($(strip $($AUDIO_FEATURE_IP_HDLR_ENABLED)),true) 
    LOCAL_SRC_FILES += audio_extn/ip_hdlr_intf.c

endif



ifeq ($(strip $($AUDIO_FEATURE_ENABLED_DYNAMIC_ECNS)),true)

    LOCAL_CFLAGS += -DDYNAMIC_ECNS_ENABLED

endif



LOCAL_CFLAGS += -Wall -Werror



LOCAL_COPY_HEADERS_TO   := mm-audio