Add codec2 capabilities (when mscodec2 plugin is present)

- update oRTP and ms2

build/android/Android.mk

@@ -173,6 +173,11 @@ LOCAL_CFLAGS += -DHAVE_SILK
 LOCAL_STATIC_LIBRARIES += libmssilk
 endif
 
+ifeq ($(BUILD_CODEC2),1)
+LOCAL_CFLAGS += -DHAVE_CODEC2
+LOCAL_STATIC_LIBRARIES += libcodec2 libmscodec2
+endif
+
 ifneq ($(BUILD_WEBRTC_AECM)$(BUILD_WEBRTC_ISAC),00)
 LOCAL_CFLAGS += -DHAVE_WEBRTC
 LOCAL_STATIC_LIBRARIES += libmswebrtc

coreapi/linphonecore.c

@@ -1565,6 +1565,8 @@ static void linphone_core_register_default_codecs(LinphoneCore *lc){
 	linphone_core_register_payload_type(lc,&payload_type_aal2_g726_24,NULL,FALSE);
 	linphone_core_register_payload_type(lc,&payload_type_aal2_g726_32,NULL,FALSE);
 	linphone_core_register_payload_type(lc,&payload_type_aal2_g726_40,NULL,FALSE);
+	linphone_core_register_payload_type(lc,&payload_type_codec2,NULL,FALSE);
+
 
 
 

coreapi/linphonecore_jni.cc

@@ -58,6 +58,9 @@ extern "C" void libmsbcg729_init();
 #ifdef HAVE_WEBRTC
 extern "C" void libmswebrtc_init();
 #endif
+#ifdef HAVE_CODEC2
+extern "C" void libmscodec2_init();
+#endif
 #include <belle-sip/wakelock.h>
 #endif /*ANDROID*/
 
@@ -1142,6 +1145,9 @@ extern "C" jlong Java_org_linphone_core_LinphoneCoreImpl_newLinphoneCore(JNIEnv*
 #ifdef HAVE_WEBRTC
 	libmswebrtc_init();
 #endif
+#ifdef HAVE_CODEC2
+	libmscodec2_init();
+#endif
 
 	jobject core = env->NewGlobalRef(thiz);
 	jlong nativePtr = (jlong)linphone_core_new(vTable, userConfig, factoryConfig, core);

mediastreamer2 @ 588b22db

-Subproject commit 07eeb876c23402422d23efa6880420fa0c90d35a
+Subproject commit 588b22dba73d04fa523f14623fd9f38cb08cc86a

oRTP @ 8409812b

-Subproject commit 714ae33119397055bc0509ea78a3651a3d1b58d5
+Subproject commit 8409812bdf023e5f0b10a2d0644d7bf96603d8d2