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

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

Merge " audio:Set the input device for VOIP calls using audio path"

parents 3fb83da8 23b3af2e

hal/audio_hw.c

+2 −3
Original line number Diff line number Diff line
@@ -631,8 +631,7 @@ int select_devices(struct audio_device *adev, audio_usecase_t uc_id) 
                out_snd_device = platform_get_output_snd_device(adev->platform,

                                            usecase->stream.out->devices);

                if (usecase->stream.out == adev->primary_output &&

                        adev->active_input &&

                        adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION) {

                        adev->active_input ) {

                    select_devices(adev, adev->active_input->usecase);

                }

            }
@@ -640,7 +639,7 @@ int select_devices(struct audio_device *adev, audio_usecase_t uc_id) 
            usecase->devices = usecase->stream.in->device;

            out_snd_device = SND_DEVICE_NONE;

            if (in_snd_device == SND_DEVICE_NONE) {

                if (adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION &&

                if ((adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION || (adev->mode == AUDIO_MODE_IN_COMMUNICATION && adev->active_input->source == AUDIO_SOURCE_MIC)) &&

                        adev->primary_output && !adev->primary_output->standby) {

                    in_snd_device = platform_get_input_snd_device(adev->platform,

                                        adev->primary_output->devices);

hal/msm8974/platform.c

+2 −1
Original line number Diff line number Diff line
@@ -1233,7 +1233,8 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
                snd_device = SND_DEVICE_IN_VOICE_REC_MIC;

            }

        }

    } else if (source == AUDIO_SOURCE_VOICE_COMMUNICATION) {

    } else if (source == AUDIO_SOURCE_VOICE_COMMUNICATION ||

               (mode == AUDIO_MODE_IN_COMMUNICATION)) {

        if (out_device & AUDIO_DEVICE_OUT_SPEAKER)

            in_device = AUDIO_DEVICE_IN_BACK_MIC;

        if (adev->active_input) {