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

Commit 26f06c79 authored by Eric Laurent's avatar Eric Laurent Committed by Android (Google) Code Review
Browse files

Merge "hal: fix mic selection for IN_COMMUNICATION mode" into mnc-dr-dev

parents cc3f2e8d 50a38ed9

hal/audio_hw.c

+7 −3
Original line number Diff line number Diff line
@@ -643,7 +643,8 @@ int select_devices(struct audio_device *adev, 
                                            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->source == AUDIO_SOURCE_VOICE_COMMUNICATION ||

                            adev->mode == AUDIO_MODE_IN_COMMUNICATION) &&

                        out_snd_device != usecase->out_snd_device) {

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

                }
@@ -653,7 +654,9 @@ int select_devices(struct audio_device *adev, 
            out_snd_device = SND_DEVICE_NONE;

            if (in_snd_device == SND_DEVICE_NONE) {

                audio_devices_t out_device = AUDIO_DEVICE_NONE;

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

                if (adev->active_input &&

                        (adev->active_input->source == AUDIO_SOURCE_VOICE_COMMUNICATION ||

                            adev->mode == AUDIO_MODE_IN_COMMUNICATION)) {

                    platform_set_echo_reference(adev, false, AUDIO_DEVICE_NONE);

                    if (usecase->id == USECASE_AUDIO_RECORD_AFE_PROXY) {

                        out_device = AUDIO_DEVICE_OUT_TELEPHONY_TX;
@@ -2058,7 +2061,8 @@ static int add_remove_audio_effect(const struct audio_stream *stream, 


    lock_input_stream(in);

    pthread_mutex_lock(&in->dev->lock);

    if ((in->source == AUDIO_SOURCE_VOICE_COMMUNICATION) &&

    if ((in->source == AUDIO_SOURCE_VOICE_COMMUNICATION ||

            adev->mode == AUDIO_MODE_IN_COMMUNICATION) &&

            in->enable_aec != enable &&

            (memcmp(&desc.type, FX_IID_AEC, sizeof(effect_uuid_t)) == 0)) {

        in->enable_aec = enable;

hal/msm8960/platform.c

+2 −1
Original line number Diff line number Diff line
@@ -794,7 +794,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) {

hal/msm8974/platform.c

+2 −1
Original line number Diff line number Diff line
@@ -1940,7 +1940,8 @@ 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_VOICE_REC_HEADSET_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 | AUDIO_DEVICE_OUT_SPEAKER_SAFE))

            in_device = AUDIO_DEVICE_IN_BACK_MIC;

        if (adev->active_input) {