From 65dc7621f45449893de50c28b94653c9af0ecb22 Mon Sep 17 00:00:00 2001
From: Guillaume Beraudo <guillaume.beraudo@belledonne-communications.com>
Date: Wed, 26 Oct 2011 11:19:03 +0200
Subject: [PATCH] Add silk pluging support (stock + Android).

---
 build/android/Android.mk    | 6 ++++++
 coreapi/linphonecore_jni.cc | 6 ++++++
 mediastreamer2              | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/build/android/Android.mk b/build/android/Android.mk
index a7b9e024b..096f94464 100755
--- 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 8713e86d2..f12a95d90 100644
--- 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 2befd4c69..eb538cd19 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 2befd4c69cda862f32b1b7ee42db2a8606bae3b7
+Subproject commit eb538cd19f9ee0a9da7669b1a439f81014180981