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

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

Merge "audio: hal: Fix to use correct EC_REF_RX"

parents 040c5e94 7294f522

hal/msm8974/platform.c

+3 −3
Original line number Diff line number Diff line
@@ -992,7 +992,7 @@ snd_device_t platform_get_input_snd_device(void *platform, audio_devices_t out_d 
            } else if (my_data->fluence_type == FLUENCE_NONE ||

                my_data->fluence_in_voice_call == false) {

                snd_device = SND_DEVICE_IN_HANDSET_MIC;

                set_echo_reference(adev->mixer, "SLIM_RX");

                set_echo_reference(adev->mixer, EC_REF_RX);

            } else {

                snd_device = SND_DEVICE_IN_VOICE_DMIC;

                adev->acdb_settings |= DMIC_FLAG;
@@ -1061,7 +1061,7 @@ 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_HEADSET_MIC_FLUENCE;

                }

                set_echo_reference(adev->mixer, "SLIM_RX");

                set_echo_reference(adev->mixer, EC_REF_RX);

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

                if (in_device & AUDIO_DEVICE_IN_BACK_MIC) {

                    if (my_data->fluence_type & FLUENCE_DUAL_MIC) {
@@ -1078,7 +1078,7 @@ 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_HEADSET_MIC_FLUENCE;

                }

                set_echo_reference(adev->mixer, "SLIM_RX");

                set_echo_reference(adev->mixer, EC_REF_RX);

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

                if (in_device & AUDIO_DEVICE_IN_BACK_MIC) {

                    if (my_data->fluence_type & FLUENCE_DUAL_MIC) {

hal/msm8974/platform.h

+2 −0
Original line number Diff line number Diff line
@@ -183,8 +183,10 @@ enum { 


#ifdef PLATFORM_MSM8610

#define LOWLATENCY_PCM_DEVICE 12

#define EC_REF_RX "I2S_RX"

#else

#define LOWLATENCY_PCM_DEVICE 15

#define EC_REF_RX "SLIM_RX"

#endif

#ifdef PLATFORM_MSM8x26

#define COMPRESS_CAPTURE_DEVICE 20