Add silk pluging support (stock + Android).

diff --git a/build/android/Android.mk b/build/android/Android.mk
index a7b9e024b3f515640f1a01d37169f51b47824e46..096f944641c211af8261355ea23ded7b38b1aacf 100755 (executable)
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -73,6 +73,7 @@ ifeq ($(BUILD_X264),1)
 LOCAL_CFLAGS += -DHAVE_X264
 endif
 endif
+
 LOCAL_C_INCLUDES += \
        $(LOCAL_PATH) \
        $(LOCAL_PATH)/include \
@@ -102,6 +103,11 @@ LOCAL_STATIC_LIBRARIES += \
        libopencoreamr 
 endif
 
+ifeq ($(BUILD_SILK),1)
+LOCAL_CFLAGS += -DHAVE_SILK
+LOCAL_STATIC_LIBRARIES += libmssilk
+endif
+
 ifeq ($(LINPHONE_VIDEO),1)
 LOCAL_LDLIBS    += -lGLESv2
 LOCAL_STATIC_LIBRARIES += libvpx

diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 8713e86d20a04c8a8745def708b126b900d09c37..f12a95d90d0c262f00fa414d1fc633dadb228028 100644 (file)
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -36,6 +36,9 @@ extern "C" void libmsx264_init();
 #ifdef HAVE_AMR
 extern "C" void libmsamr_init();
 #endif
+#ifdef HAVE_SILK
+extern "C" void libmssilk_init();
+#endif
 #endif /*ANDROID*/
 
 static JavaVM *jvm=0;
@@ -405,6 +408,9 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_newLinphoneCore(JNIEnv*
 #endif
 #ifdef HAVE_AMR
        libmsamr_init();
+#endif
+#ifdef HAVE_SILK
+       libmssilk_init();
 #endif
        jlong nativePtr = (jlong)linphone_core_new(     &ldata->vTable
                        ,userConfig

diff --git a/mediastreamer2 b/mediastreamer2
index 2befd4c69cda862f32b1b7ee42db2a8606bae3b7..eb538cd19f9ee0a9da7669b1a439f81014180981 160000 (submodule)
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 2befd4c69cda862f32b1b7ee42db2a8606bae3b7
+Subproject commit eb538cd19f9ee0a9da7669b1a439f81014180981