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

Commit 033c7cb3 authored by Vignesh Kulothungan's avatar Vignesh Kulothungan Committed by Gerrit - the friendly Code Review server
Browse files

hal: Update Single mic device from Fluence to ECNS 

- Single mic fluence devices are never used when fluence type is
  not enabled. When fluence is not enabled, single mic devices
  should use ECNS.
- Remove checks for fluence type to enable set echo reference for
  non fluence usecases.

CRs-Fixed: 2275470
Change-Id: I6d76e6332960663583a082c0de933854403255f5
parent d0bae9ba

hal/msm8916/platform.c

+35 −39
Original line number Diff line number Diff line
@@ -579,12 +579,12 @@ static struct audio_effect_config effect_config_table[GET_IN_DEVICE_INDEX(SND_DE 
                                                                0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS)][EFFECT_AEC] = {TX_VOICE_FV5ECNS_DM, 0x0, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS)][EFFECT_NS] = {TX_VOICE_FV5ECNS_DM, 0x0, 0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_MIC_AEC_NS)][EFFECT_AEC] = {TX_VOICE_FV5ECNS_SM, 0x0, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_MIC_AEC_NS)][EFFECT_NS] = {TX_VOICE_FV5ECNS_SM, 0x0, 0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_MIC)][EFFECT_AEC] = {TX_VOICE_SMECNS_V2, 0x0, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_MIC)][EFFECT_NS] = {TX_VOICE_SMECNS_V2, 0x0, 0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_DMIC_AEC_NS)][EFFECT_AEC] = {TX_VOICE_FV5ECNS_DM, 0x0, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_DMIC_AEC_NS)][EFFECT_NS] = {TX_VOICE_FV5ECNS_DM, 0x0, 0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_MIC_AEC_NS)][EFFECT_AEC] = {TX_VOICE_FV5ECNS_SM, 0x0, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_MIC_AEC_NS)][EFFECT_NS] = {TX_VOICE_FV5ECNS_SM, 0x0, 0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_MIC)][EFFECT_AEC] = {TX_VOICE_SMECNS_V2, 0x0, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_MIC)][EFFECT_NS] = {TX_VOICE_SMECNS_V2, 0x0, 0x10EAF, 0x02},

};



/* ACDB IDs (audio DSP path configuration IDs) for each sound device */
@@ -4230,7 +4230,6 @@ static snd_device_t get_snd_device_for_voice_comm(struct platform_data *my_data, 
    struct audio_device *adev = my_data->adev;

    snd_device_t snd_device = SND_DEVICE_NONE;



    if (my_data->fluence_type != FLUENCE_NONE) {

    if (in_device & AUDIO_DEVICE_IN_BACK_MIC) {

        if (my_data->fluence_in_spkr_mode) {

            if ((my_data->fluence_type & FLUENCE_QUAD_MIC) &&
@@ -4248,19 +4247,18 @@ static snd_device_t get_snd_device_for_voice_comm(struct platform_data *my_data, 
            }

            adev->acdb_settings |= DMIC_FLAG;

        } else

                snd_device = SND_DEVICE_IN_SPEAKER_MIC_AEC_NS;

            snd_device = SND_DEVICE_IN_SPEAKER_MIC;

    } else if (in_device & AUDIO_DEVICE_IN_BUILTIN_MIC) {

        if ((my_data->fluence_type & FLUENCE_DUAL_MIC) &&

            (my_data->source_mic_type & SOURCE_DUAL_MIC)) {

            snd_device = SND_DEVICE_IN_HANDSET_DMIC_AEC_NS;

            adev->acdb_settings |= DMIC_FLAG;

        } else

                snd_device = SND_DEVICE_IN_HANDSET_MIC_AEC_NS;

            snd_device = SND_DEVICE_IN_HANDSET_MIC;

    } else if (in_device & AUDIO_DEVICE_IN_WIRED_HEADSET) {

        snd_device = SND_DEVICE_IN_HEADSET_MIC_FLUENCE;

    }

    platform_set_echo_reference(adev, true, out_device);

    }



    return snd_device;

}
@@ -4272,7 +4270,7 @@ static snd_device_t get_snd_device_for_voice_comm(struct platform_data *my_data, 
    struct audio_device *adev = my_data->adev;

    snd_device_t snd_device = SND_DEVICE_NONE;



    if (my_data->fluence_type != FLUENCE_NONE && adev->active_input->enable_aec &&

    if (adev->active_input->enable_aec &&

        adev->active_input->enable_ns) {

        if (in_device & AUDIO_DEVICE_IN_BACK_MIC) {

            if (my_data->fluence_in_spkr_mode) {
@@ -4305,8 +4303,7 @@ static snd_device_t get_snd_device_for_voice_comm(struct platform_data *my_data, 
            snd_device = SND_DEVICE_IN_USB_HEADSET_MIC_AEC;

        }

        platform_set_echo_reference(adev, true, out_device);

    } else if (my_data->fluence_type != FLUENCE_NONE &&

               adev->active_input->enable_aec) {

    } else if (adev->active_input->enable_aec) {

        if (in_device & AUDIO_DEVICE_IN_BACK_MIC) {

            if (my_data->fluence_in_spkr_mode) {

                if ((my_data->fluence_type & FLUENCE_QUAD_MIC) &&
@@ -4338,8 +4335,7 @@ static snd_device_t get_snd_device_for_voice_comm(struct platform_data *my_data, 
            snd_device = SND_DEVICE_IN_USB_HEADSET_MIC_AEC;

        }

        platform_set_echo_reference(adev, true, out_device);

    } else if (my_data->fluence_type != FLUENCE_NONE &&

               adev->active_input->enable_ns) {

    } else if (adev->active_input->enable_ns) {

        if (in_device & AUDIO_DEVICE_IN_BACK_MIC) {

            if (my_data->fluence_in_spkr_mode) {

                if ((my_data->fluence_type & FLUENCE_QUAD_MIC) &&

hal/msm8916/platform.h

+1 −0
Original line number Diff line number Diff line
@@ -398,6 +398,7 @@ enum { 
#define TX_VOICE_DM_FV5_BROADSIDE 0x10F18

#define TX_VOICE_FV5ECNS_SM 0x10F09

#define TX_VOICE_FV5ECNS_DM 0x10F0A

#define TX_VOICE_SMECNS_V2 0x10F31



#define AUDIO_MAKE_STRING_FROM_ENUM(X)   { #X, X }

hal/msm8974/platform.c

+38 −42
Original line number Diff line number Diff line
@@ -561,12 +561,12 @@ static struct audio_effect_config effect_config_table[GET_IN_DEVICE_INDEX(SND_DE 
                                                                0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS)][EFFECT_AEC] = {TX_VOICE_FV5ECNS_DM, 0x0, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS)][EFFECT_NS] = {TX_VOICE_FV5ECNS_DM, 0x0, 0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_MIC_AEC_NS)][EFFECT_AEC] = {TX_VOICE_FV5ECNS_SM, 0x0, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_MIC_AEC_NS)][EFFECT_NS] = {TX_VOICE_FV5ECNS_SM, 0x0, 0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_MIC)][EFFECT_AEC] = {TX_VOICE_SMECNS_V2, 0x0, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_SPEAKER_MIC)][EFFECT_NS] = {TX_VOICE_SMECNS_V2, 0x0, 0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_DMIC_AEC_NS)][EFFECT_AEC] = {TX_VOICE_FV5ECNS_DM, 0x0, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_DMIC_AEC_NS)][EFFECT_NS] = {TX_VOICE_FV5ECNS_DM, 0x0, 0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_MIC_AEC_NS)][EFFECT_AEC] = {TX_VOICE_FV5ECNS_SM, 0x0, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_MIC_AEC_NS)][EFFECT_NS] = {TX_VOICE_FV5ECNS_SM, 0x0, 0x10EAF, 0x02},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_MIC)][EFFECT_AEC] = {TX_VOICE_SMECNS_V2, 0x0, 0x10EAF, 0x01},

    [GET_IN_DEVICE_INDEX(SND_DEVICE_IN_HANDSET_MIC)][EFFECT_NS] = {TX_VOICE_SMECNS_V2, 0x0, 0x10EAF, 0x02},

};



/* ACDB IDs (audio DSP path configuration IDs) for each sound device */
@@ -4025,7 +4025,6 @@ static snd_device_t get_snd_device_for_voice_comm(struct platform_data *my_data, 
    struct audio_device *adev = my_data->adev;

    snd_device_t snd_device = SND_DEVICE_NONE;



    if (my_data->fluence_type != FLUENCE_NONE) {

    if (in_device & AUDIO_DEVICE_IN_BACK_MIC) {

        if (my_data->fluence_in_spkr_mode) {

            if ((my_data->fluence_type & FLUENCE_QUAD_MIC) &&
@@ -4043,7 +4042,7 @@ static snd_device_t get_snd_device_for_voice_comm(struct platform_data *my_data, 
            }

            adev->acdb_settings |= DMIC_FLAG;

        } else

                snd_device = SND_DEVICE_IN_SPEAKER_MIC_AEC_NS;

            snd_device = SND_DEVICE_IN_SPEAKER_MIC;

    } else if (in_device & AUDIO_DEVICE_IN_BUILTIN_MIC) {

        if ((my_data->fluence_type & FLUENCE_TRI_MIC) &&

            (my_data->source_mic_type & SOURCE_THREE_MIC)) {
@@ -4054,12 +4053,11 @@ static snd_device_t get_snd_device_for_voice_comm(struct platform_data *my_data, 
            snd_device = SND_DEVICE_IN_HANDSET_DMIC_AEC_NS;

            adev->acdb_settings |= DMIC_FLAG;

        } else

                snd_device = SND_DEVICE_IN_HANDSET_MIC_AEC_NS;

            snd_device = SND_DEVICE_IN_HANDSET_MIC;

    } else if (in_device & AUDIO_DEVICE_IN_WIRED_HEADSET) {

            snd_device = SND_DEVICE_IN_HEADSET_MIC_FLUENCE;

        snd_device = SND_DEVICE_IN_HEADSET_MIC;

    }

    platform_set_echo_reference(adev, true, out_device);

    }



    return snd_device;

}
@@ -4071,7 +4069,7 @@ static snd_device_t get_snd_device_for_voice_comm(struct platform_data *my_data, 
    struct audio_device *adev = my_data->adev;

    snd_device_t snd_device = SND_DEVICE_NONE;



    if (my_data->fluence_type != FLUENCE_NONE && adev->active_input->enable_aec &&

    if (adev->active_input->enable_aec &&

        adev->active_input->enable_ns) {

        if (in_device & AUDIO_DEVICE_IN_BACK_MIC) {

            if (my_data->fluence_in_spkr_mode) {
@@ -4108,8 +4106,7 @@ static snd_device_t get_snd_device_for_voice_comm(struct platform_data *my_data, 
            snd_device = SND_DEVICE_IN_USB_HEADSET_MIC_AEC;

        }

        platform_set_echo_reference(adev, true, out_device);

    } else if (my_data->fluence_type != FLUENCE_NONE &&

               adev->active_input->enable_aec) {

    } else if (adev->active_input->enable_aec) {

        if (in_device & AUDIO_DEVICE_IN_BACK_MIC) {

            if (my_data->fluence_in_spkr_mode) {

                if ((my_data->fluence_type & FLUENCE_QUAD_MIC) &&
@@ -4145,8 +4142,7 @@ static snd_device_t get_snd_device_for_voice_comm(struct platform_data *my_data, 
            snd_device = SND_DEVICE_IN_USB_HEADSET_MIC_AEC;

        }

        platform_set_echo_reference(adev, true, out_device);

    } else if (my_data->fluence_type != FLUENCE_NONE &&

               adev->active_input->enable_ns) {

    } else if (adev->active_input->enable_ns) {

        if (in_device & AUDIO_DEVICE_IN_BACK_MIC) {

            if (my_data->fluence_in_spkr_mode) {

                if ((my_data->fluence_type & FLUENCE_QUAD_MIC) &&

hal/msm8974/platform.h

+1 −0
Original line number Diff line number Diff line
@@ -518,6 +518,7 @@ enum { 
#define TX_VOICE_FLUENCE_PROV2 0x10F17

#define TX_VOICE_DM_FV5_BROADSIDE 0x10F18

#define TX_VOICE_FV5ECNS_SM 0x10F09

#define TX_VOICE_SMECNS_V2 0x10F31

#define TX_VOICE_FV5ECNS_DM 0x10F0A



#define LIB_CSD_CLIENT "libcsd-client.so"