witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Use the iSAC codec and WebRTC echo canceller from the mswebrtc plugin on Android.

Browse source
This commit is contained in:
Ghislain MARY 2014-06-13 14:57:24 +02:00
parent 0021b21feb
commit 7caaca64ff
3 changed files with 30 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
build/android/Android.mk
View file

@ -160,10 +160,31 @@ LOCAL_CFLAGS += -DHAVE_SILK
LOCAL_STATIC_LIBRARIES += libmssilk
endif
ifeq ($(BUILD_WEBRTC_ISAC),1)
LOCAL_CFLAGS += -DHAVE_ISAC
LOCAL_STATIC_LIBRARIES += libwebrtc_isacfix_neon
LOCAL_STATIC_LIBRARIES += libwebrtc_spl libwebrtc_isacfix libmsisac
ifneq ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC),00)
LOCAL_CFLAGS += -DHAVE_WEBRTC
LOCAL_STATIC_LIBRARIES += libmswebrtc
endif
ifneq ($(BUILD_WEBRTC_AECM),0)
LOCAL_STATIC_LIBRARIES += \
libwebrtc_aecm \
libwebrtc_apm_utility \
libwebrtc_spl \
libwebrtc_system_wrappers
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
LOCAL_STATIC_LIBRARIES += \
libwebrtc_aecm_neon \
libwebrtc_spl_neon
endif
endif
ifneq ($(BUILD_WEBRTC_ISAC),0)
LOCAL_STATIC_LIBRARIES += \
libwebrtc_isacfix \
libwebrtc_spl
ifeq ($(TARGET_ARCH_ABI), armeabi-v7a)
LOCAL_STATIC_LIBRARIES += \
libwebrtc_isacfix_neon \
libwebrtc_spl_neon
endif
endif
ifeq ($(BUILD_G729),1)

8
coreapi/linphonecore_jni.cc
View file

@ -52,8 +52,8 @@ extern "C" void libmssilk_init();
#ifdef HAVE_G729
extern "C" void libmsbcg729_init();
#endif
#ifdef HAVE_ISAC
extern "C" void libmsisac_init();
#ifdef HAVE_WEBRTC
extern "C" void libmswebrtc_init();
#endif
#endif /*ANDROID*/
@ -787,8 +787,8 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_newLinphoneCore(JNIEnv*
#ifdef HAVE_G729
libmsbcg729_init();
#endif
#ifdef HAVE_ISAC
libmsisac_init();
#ifdef HAVE_WEBRTC
libmswebrtc_init();
#endif
jlong nativePtr = (jlong)linphone_core_new( &ldata->vTable

2
mediastreamer2

@ -1 +1 @@
Subproject commit ebc30daf06e5b98eab43257fbf425aac291a7bba
Subproject commit 903d16fd95c070f8194221142aaa13c17be7d535