From 8a99057d8d248ba532f0d6125ca5c02cebcda4ee Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Tue, 19 Jul 2016 12:50:04 +0200 Subject: [PATCH] Fixed needsEchoCalibration JNI method --- coreapi/linphonecore_jni.cc | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index 94d92503a..a84868781 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -2388,25 +2388,16 @@ extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_startEchoCalibration(JNI } extern "C" jboolean Java_org_linphone_core_LinphoneCoreImpl_needsEchoCalibration(JNIEnv *env, jobject thiz, jlong lcptr) { - MSSndCard *sndcard; LinphoneCore *lc = (LinphoneCore*) lcptr; MSFactory * factory = linphone_core_get_ms_factory(lc); - MSSndCardManager *m = ms_factory_get_snd_card_manager(factory); - const char *card = linphone_core_get_capture_device((LinphoneCore*)lc); - sndcard = ms_snd_card_manager_get_card(m, card); - if (sndcard == NULL) { - ms_error("Could not get soundcard %s", card); - return TRUE; - } - MSDevicesInfo *devices = ms_factory_get_devices_info(factory); SoundDeviceDescription *sound_description = ms_devices_info_get_sound_device_description(devices); if(sound_description != NULL && sound_description == &genericSoundDeviceDescriptor){ return TRUE; } - if (ms_snd_card_get_capabilities(sndcard) & MS_SND_CARD_CAP_BUILTIN_ECHO_CANCELLER) return FALSE; - if (ms_snd_card_get_minimal_latency(sndcard) != 0) return FALSE; + if (sound_description->flags & DEVICE_HAS_BUILTIN_AEC) return FALSE; + if (sound_description->delay != 0) return FALSE; return TRUE; }