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

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

Merge 9c41253a on remote branch 

Change-Id: I327d5381186010514c2cf444812daf081645f832
parents 45f30ed9 9c41253a

configs/lahaina/audio_platform_info_yupikidp.xml

+1 −0
Original line number Diff line number Diff line
@@ -147,6 +147,7 @@ 
        <device name="SND_DEVICE_IN_UNPROCESSED_HEADSET_MIC" acdb_id="147"/>

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

        <device name="SND_DEVICE_IN_VOICE_HEARING_AID" acdb_id="11"/>

        <device name="SND_DEVICE_IN_VOICE_REC_MIC" acdb_id="200"/>

        <device name="SND_DEVICE_OUT_VOICE_HANDSET_TMUS" acdb_id="7"/>

        <device name="SND_DEVICE_IN_BT_A2DP" acdb_id="201"/>

    </acdb_ids>

hal/audio_hw.c

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2021, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2022, The Linux Foundation. All rights reserved.

 * Not a Contribution.

 *

 * Copyright (C) 2013 The Android Open Source Project
@@ -7548,6 +7548,7 @@ static int add_remove_audio_effect(const struct audio_stream *stream, 
        ALOGD("NS enable %d", enable);

        if (!in->standby) {

            if (in->source == AUDIO_SOURCE_VOICE_COMMUNICATION ||

                in->source == AUDIO_SOURCE_VOICE_RECOGNITION ||

                in->dev->mode == AUDIO_MODE_IN_COMMUNICATION) {

                if (enable_disable_effect(in->dev, EFFECT_NS, enable) == ENOSYS)

                    select_devices(in->dev, in->usecase);

hal/msm8974/platform.c

+7 −3
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013-2021, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2022, The Linux Foundation. All rights reserved.

 * Not a Contribution.

 *

 * Copyright (C) 2013 The Android Open Source Project
@@ -846,6 +846,9 @@ static struct audio_effect_config effect_config_table[GET_IN_DEVICE_INDEX(SND_DE 
    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_MIC_NN)][EFFECT_NS] = {TX_VOICE_FLUENCE_SM_NN, 0x8000, 0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_MIC_NN)][EFFECT_AEC] = {TX_VOICE_FLUENCE_SM_NN, 0x8000, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_MIC_NN)][EFFECT_NS] = {TX_VOICE_FLUENCE_SM_NN, 0x8000, 0x10EAF, 0x02},









    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_VOICE_REC_MIC)][EFFECT_AEC] = {TX_VOICE_FLUENCEV5_SM, 0x0, 0x10EAF, 0x01},









    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_VOICE_REC_MIC)][EFFECT_NS] = {TX_VOICE_FLUENCEV5_SM, 0x0, 0x10EAF, 0x02},









};

















static struct audio_fluence_mmsecns_config fluence_mmsecns_table = {TOPOLOGY_ID_MM_HFP_ECNS, MODULE_ID_MM_HFP_ECNS,








@@ -7554,10 +7557,11 @@ snd_device_t platform_get_input_snd_device(void *platform,







        else if (compare_device_type(out_devices, AUDIO_DEVICE_OUT_USB_DEVICE))









            reassign_device_list(&in_devices, AUDIO_DEVICE_IN_USB_DEVICE, address);

















        if (list_empty(out_devices))









        if (adev->bt_sco_on == true)









            reassign_device_list(&in_devices, AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET, address);









        else if (list_empty(out_devices))









            reassign_device_list(&in_devices, AUDIO_DEVICE_IN_BUILTIN_MIC,









                                 address);

















        if (in)









            snd_device = get_snd_device_for_voice_comm(my_data, in, out_devices, &in_devices);









    } else if (source == AUDIO_SOURCE_MIC) {
































hal/msm8974/platform.h



+2
−1






























Original line number
Diff line number
Diff line









/*









 * Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.









 * Copyright (c) 2013-2020, 2022, The Linux Foundation. All rights reserved.









 * Not a Contribution.









 *









 * Copyright (C) 2013 The Android Open Source Project








@@ -760,6 +760,7 @@ enum {







#define TX_VOICE_FLUENCE_SM_SB 0x10F38









#define TX_VOICE_FLUENCE_MM_SB 0x10F39









#define TX_VOICE_FLUENCE_SM_NN 0x10B0F









#define TX_VOICE_FLUENCEV5_SM 0x10F32



















/* multi-mic surround ECNS zone control */









#define TOPOLOGY_ID_MM_HFP_ECNS 0x1FFF0002