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

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

Merge "hal: Define a new combo device for AANC and Fluence"

parents 8e512ce3 3bcca231

hal/msm8916/platform.c

+9 −0
Original line number Diff line number Diff line
@@ -284,6 +284,7 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_SPEAKER_DMIC_AEC_BROADSIDE] = "speaker-dmic-broadside",

    [SND_DEVICE_IN_SPEAKER_DMIC_NS_BROADSIDE] = "speaker-dmic-broadside",

    [SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS_BROADSIDE] = "speaker-dmic-broadside",

    [SND_DEVICE_IN_VOICE_FLUENCE_DMIC_AANC] = "aanc-fluence-dmic-handset",

};



/* ACDB IDs (audio DSP path configuration IDs) for each sound device */
@@ -369,6 +370,7 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_SPEAKER_DMIC_AEC_BROADSIDE] = 119,

    [SND_DEVICE_IN_SPEAKER_DMIC_NS_BROADSIDE] = 121,

    [SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS_BROADSIDE] = 120,

    [SND_DEVICE_IN_VOICE_FLUENCE_DMIC_AANC] = 135,

};



struct snd_device_index {
@@ -454,6 +456,7 @@ struct snd_device_index snd_device_name_index[SND_DEVICE_MAX] = { 
    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_STEREO_DMIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_STEREO_DMIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_CAPTURE_VI_FEEDBACK)},

    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_FLUENCE_DMIC_AANC)},

};



#define NO_COLS 2
@@ -1756,6 +1759,12 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
        if (out_device & AUDIO_DEVICE_OUT_EARPIECE ||

            out_device & AUDIO_DEVICE_OUT_WIRED_HEADPHONE) {

            if (out_device & AUDIO_DEVICE_OUT_EARPIECE &&

                audio_extn_should_use_handset_anc(channel_count) &&

                my_data->fluence_type != FLUENCE_NONE) {

                snd_device = SND_DEVICE_IN_VOICE_FLUENCE_DMIC_AANC;

                adev->acdb_settings |= DMIC_FLAG;

                ALOGD("Selecting AANC, Fluence combo device");

            } else if (out_device & AUDIO_DEVICE_OUT_EARPIECE &&

                audio_extn_should_use_handset_anc(channel_count)) {

                snd_device = SND_DEVICE_IN_AANC_HANDSET_MIC;

            } else if (my_data->fluence_type == FLUENCE_NONE ||

hal/msm8916/platform.h

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ enum { 
    SND_DEVICE_IN_SPEAKER_DMIC_AEC_BROADSIDE,

    SND_DEVICE_IN_SPEAKER_DMIC_NS_BROADSIDE,

    SND_DEVICE_IN_SPEAKER_DMIC_AEC_NS_BROADSIDE,

    SND_DEVICE_IN_VOICE_FLUENCE_DMIC_AANC,

    SND_DEVICE_IN_END,



    SND_DEVICE_MAX = SND_DEVICE_IN_END,