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

Commit e240e5d3 authored by Vicky Sehrawat's avatar Vicky Sehrawat
Browse files

hal: Provide support to enable/disable EC/NS in BT 

Currently during a SCO connection ECNS module in ADSP
is disabled by default. Some BT headsets have built-in
support for echo cancellation and noise reduction and
therefore do not require the same to be done again.
Select BT_SCO devices with ECNS modules enabled when
setParameters() is called with NREC=on.

Change-Id: I8bc37358a4510de7112d5247efbd5d3d7420fe43
parent 094d4385

hal/audio_hw.c

+1 −3
Original line number Diff line number Diff line
@@ -2672,9 +2672,7 @@ static int adev_set_parameters(struct audio_hw_device *dev, const char *kvpairs) 


    err = str_parms_get_str(parms, AUDIO_PARAMETER_KEY_BT_NREC, value, sizeof(value));

    if (err >= 0) {

        /* When set to false, HAL should disable EC and NS

         * But it is currently not supported.

         */

        /* When set to false, HAL should disable EC and NS */

        if (strcmp(value, AUDIO_PARAMETER_VALUE_ON) == 0)

            adev->bluetooth_nrec = true;

        else

hal/msm8916/platform.c

+43 −14
Original line number Diff line number Diff line
@@ -231,7 +231,9 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_VOICE_HEADSET_MIC] = "voice-headset-mic",

    [SND_DEVICE_IN_HDMI_MIC] = "hdmi-mic",

    [SND_DEVICE_IN_BT_SCO_MIC] = "bt-sco-mic",

    [SND_DEVICE_IN_BT_SCO_MIC_NREC] = "bt-sco-mic",

    [SND_DEVICE_IN_BT_SCO_MIC_WB] = "bt-sco-mic-wb",

    [SND_DEVICE_IN_BT_SCO_MIC_WB_NREC] = "bt-sco-mic-wb",

    [SND_DEVICE_IN_CAMCORDER_MIC] = "camcorder-mic",

    [SND_DEVICE_IN_VOICE_DMIC] = "voice-dmic-ef",

    [SND_DEVICE_IN_VOICE_SPEAKER_DMIC] = "voice-speaker-dmic-ef",
@@ -309,7 +311,9 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_VOICE_HEADSET_MIC] = 8,

    [SND_DEVICE_IN_HDMI_MIC] = 4,

    [SND_DEVICE_IN_BT_SCO_MIC] = 21,

    [SND_DEVICE_IN_BT_SCO_MIC_NREC] = 122,

    [SND_DEVICE_IN_BT_SCO_MIC_WB] = 38,

    [SND_DEVICE_IN_BT_SCO_MIC_WB_NREC] = 123,

    [SND_DEVICE_IN_CAMCORDER_MIC] = 4,

    [SND_DEVICE_IN_VOICE_DMIC] = 41,

    [SND_DEVICE_IN_VOICE_SPEAKER_DMIC] = 43,
@@ -392,7 +396,9 @@ struct snd_device_index snd_device_name_index[SND_DEVICE_MAX] = { 
    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_HEADSET_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_HDMI_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_BT_SCO_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_BT_SCO_MIC_NREC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_BT_SCO_MIC_WB)},

    {TO_NAME_INDEX(SND_DEVICE_IN_BT_SCO_MIC_WB_NREC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_CAMCORDER_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_DMIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_SPEAKER_DMIC)},
@@ -819,9 +825,11 @@ int platform_get_snd_device_name_extn(void *platform, snd_device_t snd_device, 


void platform_add_backend_name(char *mixer_path, snd_device_t snd_device)

{

    if (snd_device == SND_DEVICE_IN_BT_SCO_MIC)

    if ((snd_device == SND_DEVICE_IN_BT_SCO_MIC) ||

         (snd_device == SND_DEVICE_IN_BT_SCO_MIC_NREC))

        strlcat(mixer_path, " bt-sco", MIXER_PATH_MAX_LENGTH);

    else if (snd_device == SND_DEVICE_IN_BT_SCO_MIC_WB)

    else if ((snd_device == SND_DEVICE_IN_BT_SCO_MIC_WB) ||

              (snd_device == SND_DEVICE_IN_BT_SCO_MIC_WB_NREC))

        strlcat(mixer_path, " bt-sco-wb", MIXER_PATH_MAX_LENGTH);

    else if(snd_device == SND_DEVICE_OUT_BT_SCO)

        strlcat(mixer_path, " bt-sco", MIXER_PATH_MAX_LENGTH);
@@ -1428,10 +1436,17 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
            snd_device = SND_DEVICE_IN_VOICE_HEADSET_MIC;

            set_echo_reference(adev->mixer, EC_REF_RX);

        } else if (out_device & AUDIO_DEVICE_OUT_ALL_SCO) {

            if (adev->bt_wb_speech_enabled)

            if (adev->bt_wb_speech_enabled) {

                if (adev->bluetooth_nrec)

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC_WB_NREC;

                else

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC_WB;

            } else {

                if (adev->bluetooth_nrec)

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC_NREC;

                else

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC;

            }

        } else if (out_device & AUDIO_DEVICE_OUT_SPEAKER) {

            if (my_data->fluence_type != FLUENCE_NONE &&

                my_data->fluence_in_voice_call &&
@@ -1580,10 +1595,17 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
        } else if (in_device & AUDIO_DEVICE_IN_WIRED_HEADSET) {

            snd_device = SND_DEVICE_IN_HEADSET_MIC;

        } else if (in_device & AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET) {

            if (adev->bt_wb_speech_enabled)

            if (adev->bt_wb_speech_enabled) {

                if (adev->bluetooth_nrec)

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC_WB_NREC;

                else

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC_WB;

            } else {

                if (adev->bluetooth_nrec)

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC_NREC;

                else

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC;

            }

        } else if (in_device & AUDIO_DEVICE_IN_AUX_DIGITAL) {

            snd_device = SND_DEVICE_IN_HDMI_MIC;

        } else if (in_device & AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET ||
@@ -1609,10 +1631,17 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
        } else if (out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE) {

            snd_device = SND_DEVICE_IN_HANDSET_MIC;

        } else if (out_device & AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET) {

            if (adev->bt_wb_speech_enabled)

            if (adev->bt_wb_speech_enabled) {

                if (adev->bluetooth_nrec)

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC_WB_NREC;

                else

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC_WB;

            } else {

                if (adev->bluetooth_nrec)

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC_NREC;

                else

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC;

            }

        } else if (out_device & AUDIO_DEVICE_OUT_AUX_DIGITAL) {

            snd_device = SND_DEVICE_IN_HDMI_MIC;

        } else if (out_device & AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET ||

hal/msm8916/platform.h

+2 −0
Original line number Diff line number Diff line
@@ -107,7 +107,9 @@ enum { 
    SND_DEVICE_IN_VOICE_HEADSET_MIC,

    SND_DEVICE_IN_HDMI_MIC,

    SND_DEVICE_IN_BT_SCO_MIC,

    SND_DEVICE_IN_BT_SCO_MIC_NREC,

    SND_DEVICE_IN_BT_SCO_MIC_WB,

    SND_DEVICE_IN_BT_SCO_MIC_WB_NREC,

    SND_DEVICE_IN_CAMCORDER_MIC,

    SND_DEVICE_IN_VOICE_DMIC,

    SND_DEVICE_IN_VOICE_SPEAKER_DMIC,

hal/msm8974/platform.c

+41 −12
Original line number Diff line number Diff line
@@ -264,7 +264,9 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_VOICE_HEADSET_MIC] = "voice-headset-mic",

    [SND_DEVICE_IN_HDMI_MIC] = "hdmi-mic",

    [SND_DEVICE_IN_BT_SCO_MIC] = "bt-sco-mic",

    [SND_DEVICE_IN_BT_SCO_MIC_NREC] = "bt-sco-mic",

    [SND_DEVICE_IN_BT_SCO_MIC_WB] = "bt-sco-mic-wb",

    [SND_DEVICE_IN_BT_SCO_MIC_WB_NREC] = "bt-sco-mic-wb",

    [SND_DEVICE_IN_CAMCORDER_MIC] = "camcorder-mic",

    [SND_DEVICE_IN_VOICE_DMIC] = "voice-dmic-ef",

    [SND_DEVICE_IN_VOICE_SPEAKER_DMIC] = "voice-speaker-dmic-ef",
@@ -347,7 +349,9 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_VOICE_HEADSET_MIC] = 8,

    [SND_DEVICE_IN_HDMI_MIC] = 4,

    [SND_DEVICE_IN_BT_SCO_MIC] = 21,

    [SND_DEVICE_IN_BT_SCO_MIC_NREC] = 122,

    [SND_DEVICE_IN_BT_SCO_MIC_WB] = 38,

    [SND_DEVICE_IN_BT_SCO_MIC_WB_NREC] = 123,

    [SND_DEVICE_IN_CAMCORDER_MIC] = 4,

    [SND_DEVICE_IN_VOICE_DMIC] = 41,

    [SND_DEVICE_IN_VOICE_SPEAKER_DMIC] = 43,
@@ -435,7 +439,9 @@ static struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { 
    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_HEADSET_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_HDMI_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_BT_SCO_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_BT_SCO_MIC_NREC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_BT_SCO_MIC_WB)},

    {TO_NAME_INDEX(SND_DEVICE_IN_BT_SCO_MIC_WB_NREC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_CAMCORDER_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_DMIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_SPEAKER_DMIC)},
@@ -694,6 +700,8 @@ static void set_platform_defaults(struct platform_data * my_data) 
    // will help in avoiding strdups here

    backend_table[SND_DEVICE_IN_BT_SCO_MIC] = strdup("bt-sco");

    backend_table[SND_DEVICE_IN_BT_SCO_MIC_WB] = strdup("bt-sco-wb");

    backend_table[SND_DEVICE_IN_BT_SCO_MIC_NREC] = strdup("bt-sco");

    backend_table[SND_DEVICE_IN_BT_SCO_MIC_WB_NREC] = strdup("bt-sco-wb");

    backend_table[SND_DEVICE_OUT_BT_SCO] = strdup("bt-sco");

    backend_table[SND_DEVICE_OUT_BT_SCO_WB] = strdup("bt-sco-wb");

    backend_table[SND_DEVICE_OUT_HDMI] = strdup("hdmi");
@@ -1609,10 +1617,17 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
            snd_device = SND_DEVICE_IN_VOICE_HEADSET_MIC;

            set_echo_reference(adev, true);

        } else if (out_device & AUDIO_DEVICE_OUT_ALL_SCO) {

            if (adev->bt_wb_speech_enabled)

            if (adev->bt_wb_speech_enabled) {

                if (adev->bluetooth_nrec)

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC_WB_NREC;

                else

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC_WB;

            } else {

                if (adev->bluetooth_nrec)

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC_NREC;

                else

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC;

            }

        } else if (out_device & AUDIO_DEVICE_OUT_SPEAKER) {

            if (my_data->fluence_type != FLUENCE_NONE &&

                my_data->fluence_in_voice_call &&
@@ -1760,10 +1775,17 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
        } else if (in_device & AUDIO_DEVICE_IN_WIRED_HEADSET) {

            snd_device = SND_DEVICE_IN_HEADSET_MIC;

        } else if (in_device & AUDIO_DEVICE_IN_BLUETOOTH_SCO_HEADSET) {

            if (adev->bt_wb_speech_enabled)

            if (adev->bt_wb_speech_enabled) {

                if (adev->bluetooth_nrec)

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC_WB_NREC;

                else

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC_WB;

            } else {

                if (adev->bluetooth_nrec)

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC_NREC;

                else

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC;

            }

        } else if (in_device & AUDIO_DEVICE_IN_AUX_DIGITAL) {

            snd_device = SND_DEVICE_IN_HDMI_MIC;

        } else if (in_device & AUDIO_DEVICE_IN_ANLG_DOCK_HEADSET ||
@@ -1789,10 +1811,17 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
        } else if (out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE) {

            snd_device = SND_DEVICE_IN_HANDSET_MIC;

        } else if (out_device & AUDIO_DEVICE_OUT_BLUETOOTH_SCO_HEADSET) {

            if (adev->bt_wb_speech_enabled)

            if (adev->bt_wb_speech_enabled) {

                if (adev->bluetooth_nrec)

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC_WB_NREC;

                else

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC_WB;

            } else {

                if (adev->bluetooth_nrec)

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC_NREC;

                else

                    snd_device = SND_DEVICE_IN_BT_SCO_MIC;

            }

        } else if (out_device & AUDIO_DEVICE_OUT_AUX_DIGITAL) {

            snd_device = SND_DEVICE_IN_HDMI_MIC;

        } else if (out_device & AUDIO_DEVICE_OUT_ANLG_DOCK_HEADSET ||

hal/msm8974/platform.h

+2 −0
Original line number Diff line number Diff line
@@ -112,7 +112,9 @@ enum { 
    SND_DEVICE_IN_VOICE_HEADSET_MIC,

    SND_DEVICE_IN_HDMI_MIC,

    SND_DEVICE_IN_BT_SCO_MIC,

    SND_DEVICE_IN_BT_SCO_MIC_NREC,

    SND_DEVICE_IN_BT_SCO_MIC_WB,

    SND_DEVICE_IN_BT_SCO_MIC_WB_NREC,

    SND_DEVICE_IN_CAMCORDER_MIC,

    SND_DEVICE_IN_VOICE_DMIC,

    SND_DEVICE_IN_VOICE_SPEAKER_DMIC,