From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 17 Feb 2012 08:05:55 +0000 (+0100)
Subject: g729 integration for Android
X-Git-Url: http://sjero.net/git/?p=linphone;a=commitdiff_plain;h=5732fcea54f21b781470b34e0a63c2d5ebd31470

g729 integration for Android
---

diff --git a/build/android/Android.mk b/build/android/Android.mk
index a6d703d1..bf02efce 100755
--- a/build/android/Android.mk
+++ b/build/android/Android.mk
@@ -132,6 +132,12 @@ LOCAL_CFLAGS += -DHAVE_SILK
 LOCAL_STATIC_LIBRARIES += libmssilk
 endif
 
+ifeq ($(BUILD_G729),1)
+LOCAL_CFLAGS += -DHAVE_G729
+LOCAL_SHARED_LIBRARIES += libbcg729
+LOCAL_STATIC_LIBRARIES += libmsbcg729
+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 7fccd4cd..e61f0b8f 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -43,6 +43,9 @@ extern "C" void libmsamr_init();
 #ifdef HAVE_SILK
 extern "C" void libmssilk_init();
 #endif
+#ifdef HAVE_G729
+extern "C" void libmsbcg729_init();
+#endif
 #endif /*ANDROID*/
 
 static JavaVM *jvm=0;
@@ -415,6 +418,9 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_newLinphoneCore(JNIEnv*
 #endif
 #ifdef HAVE_SILK
 	libmssilk_init();
+#endif
+#ifdef HAVE_G729
+	libmsbcg729_init();
 #endif
 	jlong nativePtr = (jlong)linphone_core_new(	&ldata->vTable
 			,userConfig