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

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

Merge "hal: fix for Fluence V5 ECNS failing to work with AANC" into av-userspace.lnx.1.0-dev.1.0

parents 603ae9b0 dd287265

hal/msm8974/platform.c

+9 −1
Original line number Diff line number Diff line
@@ -408,6 +408,7 @@ static const char * const device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_USB_HEADSET_MIC] = "usb-headset-mic",

    [SND_DEVICE_IN_CAPTURE_FM] = "capture-fm",

    [SND_DEVICE_IN_AANC_HANDSET_MIC] = "aanc-handset-mic",

    [SND_DEVICE_IN_VOICE_FLUENCE_DMIC_AANC] = "aanc-handset-mic",

    [SND_DEVICE_IN_QUAD_MIC] = "quad-mic",

    [SND_DEVICE_IN_HANDSET_STEREO_DMIC] = "handset-stereo-dmic-ef",

    [SND_DEVICE_IN_SPEAKER_STEREO_DMIC] = "speaker-stereo-dmic-ef",
@@ -513,6 +514,7 @@ static int acdb_device_table[SND_DEVICE_MAX] = { 
    [SND_DEVICE_IN_USB_HEADSET_MIC] = 44,

    [SND_DEVICE_IN_CAPTURE_FM] = 0,

    [SND_DEVICE_IN_AANC_HANDSET_MIC] = 104,

    [SND_DEVICE_IN_VOICE_FLUENCE_DMIC_AANC] = 105,

    [SND_DEVICE_IN_QUAD_MIC] = 46,

    [SND_DEVICE_IN_HANDSET_STEREO_DMIC] = 34,

    [SND_DEVICE_IN_SPEAKER_STEREO_DMIC] = 35,
@@ -617,6 +619,7 @@ static struct name_to_index snd_device_name_index[SND_DEVICE_MAX] = { 
    {TO_NAME_INDEX(SND_DEVICE_IN_USB_HEADSET_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_CAPTURE_FM)},

    {TO_NAME_INDEX(SND_DEVICE_IN_AANC_HANDSET_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_VOICE_FLUENCE_DMIC_AANC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_QUAD_MIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_HANDSET_STEREO_DMIC)},

    {TO_NAME_INDEX(SND_DEVICE_IN_SPEAKER_STEREO_DMIC)},
@@ -2607,7 +2610,12 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
                out_device & AUDIO_DEVICE_OUT_LINE) {

            if (out_device & AUDIO_DEVICE_OUT_EARPIECE &&

                audio_extn_should_use_handset_anc(channel_count)) {

                if(my_data->fluence_type != FLUENCE_NONE) {

                    snd_device = SND_DEVICE_IN_VOICE_FLUENCE_DMIC_AANC;

                    adev->acdb_settings |= DMIC_FLAG;

                } else {

                    snd_device = SND_DEVICE_IN_AANC_HANDSET_MIC;

                }

                adev->acdb_settings |= ANC_FLAG;

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

                my_data->fluence_in_voice_call == false) {

hal/msm8974/platform.h

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

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

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

 * Not a Contribution.

 *

 * Copyright (C) 2013 The Android Open Source Project
@@ -165,6 +165,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_HANDSET_QMIC,

    SND_DEVICE_IN_SPEAKER_QMIC_AEC,

    SND_DEVICE_IN_SPEAKER_QMIC_NS,