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

Commit 707ab149 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 incorrect fluence devices selection for VoIP calls" into... 

Merge "hal: Fix incorrect fluence devices selection for VoIP calls" into audio-userspace.lnx.2.1-dev
parents 0b55ec76 6ed1e637

hal/msm8974/platform.c

+6 −3
Original line number Diff line number Diff line
@@ -3187,7 +3187,8 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
        if (out_device & AUDIO_DEVICE_OUT_SPEAKER)

            in_device = AUDIO_DEVICE_IN_BACK_MIC;

        if (adev->active_input) {

            if (adev->active_input->enable_aec &&

            if (my_data->fluence_type != FLUENCE_NONE &&

                    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) {
@@ -3213,7 +3214,8 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
                    snd_device = SND_DEVICE_IN_HEADSET_MIC_FLUENCE;

                }

                platform_set_echo_reference(adev, true, out_device);

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

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

                       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) &&
@@ -3238,7 +3240,8 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
                    snd_device = SND_DEVICE_IN_HEADSET_MIC_FLUENCE;

                }

                platform_set_echo_reference(adev, true, out_device);

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

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

                       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) &&