From 5b0986b0bea918d12f1a7c5b052423133ab993b6 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Tue, 9 Jul 2013 09:53:57 +0200 Subject: [PATCH 1/8] Update ms2 (msoxdisplay fix) --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index cab341d59..36f18a7c8 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit cab341d59bc4d37f82ddccbfcf1ae2563f9c5028 +Subproject commit 36f18a7c86a9fe7e81eeef1e361ac5a99d3e8c39 From 4905f373441bc35f7e9b43b748612b1190a57b00 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Tue, 9 Jul 2013 10:53:39 +0200 Subject: [PATCH 2/8] Disable selfview before destroying core --- coreapi/linphonecore.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index cffb6b6bb..76ce57b88 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -5276,6 +5276,8 @@ LpConfig *linphone_core_get_config(LinphoneCore *lc){ static void linphone_core_uninit(LinphoneCore *lc) { linphone_core_free_hooks(lc); + lc->video_conf.show_local = false; + while(lc->calls) { LinphoneCall *the_call = lc->calls->data; From 36c4b1523df6d9e14431a26da2c84fc257be1a71 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Tue, 9 Jul 2013 11:03:20 +0200 Subject: [PATCH 3/8] Fix previous commit false => FALSE --- coreapi/linphonecore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 76ce57b88..93b3b6c14 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -5276,7 +5276,7 @@ LpConfig *linphone_core_get_config(LinphoneCore *lc){ static void linphone_core_uninit(LinphoneCore *lc) { linphone_core_free_hooks(lc); - lc->video_conf.show_local = false; + lc->video_conf.show_local = FALSE; while(lc->calls) { From 22a969a07298fb0166872fa68b9b60204413aff1 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Tue, 9 Jul 2013 12:15:29 +0200 Subject: [PATCH 4/8] Update ms2 (auto-creation of video view) --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index 36f18a7c8..c2fd01b76 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 36f18a7c86a9fe7e81eeef1e361ac5a99d3e8c39 +Subproject commit c2fd01b765ceefb333865b645e73873c4ef7c902 From 2372467ac6a30d1e1a4355679b7ba4476bce65dc Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Wed, 10 Jul 2013 10:28:57 +0200 Subject: [PATCH 5/8] Update ms2 submodule. --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index c2fd01b76..aebfe443e 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit c2fd01b765ceefb333865b645e73873c4ef7c902 +Subproject commit aebfe443e91aa1e1c1e32b2410cc1d9a5db629c1 From ca5128238b4541dfb2bd56d2dec47f9427006e48 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Thu, 11 Jul 2013 11:50:47 +0200 Subject: [PATCH 6/8] Fix const-correctness in linphone_core_find_call_from_uri --- coreapi/linphonecore.c | 4 ++-- coreapi/linphonecore.h | 2 +- coreapi/linphonecore_jni.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 93b3b6c14..3c12d2437 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -5678,11 +5678,11 @@ const char *linphone_core_get_zrtp_secrets_file(LinphoneCore *lc){ return lc->zrtp_secrets_cache; } -const LinphoneCall* linphone_core_find_call_from_uri(LinphoneCore *lc, const char *uri) { +LinphoneCall* linphone_core_find_call_from_uri(const LinphoneCore *lc, const char *uri) { if (uri == NULL) return NULL; MSList *calls=lc->calls; while(calls) { - const LinphoneCall *c=(LinphoneCall*)calls->data; + LinphoneCall *c=(LinphoneCall*)calls->data; calls=calls->next; const LinphoneAddress *address = linphone_call_get_remote_address(c); char *current_uri=linphone_address_as_string_uri_only(address); diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index 50686a2c9..93ab0ca88 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -1460,7 +1460,7 @@ const char *linphone_core_get_zrtp_secrets_file(LinphoneCore *lc); * @param uri which should match call remote uri * @return LinphoneCall or NULL is no match is found */ -const LinphoneCall* linphone_core_find_call_from_uri(LinphoneCore *lc, const char *uri); +LinphoneCall* linphone_core_find_call_from_uri(const LinphoneCore *lc, const char *uri); int linphone_core_add_to_conference(LinphoneCore *lc, LinphoneCall *call); int linphone_core_add_all_to_conference(LinphoneCore *lc); diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc index 2c37903b4..19e5ff43d 100644 --- a/coreapi/linphonecore_jni.cc +++ b/coreapi/linphonecore_jni.cc @@ -2281,7 +2281,7 @@ extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setZrtpSecretsCache(JNIE extern "C" jobject Java_org_linphone_core_LinphoneCoreImpl_findCallFromUri(JNIEnv *env,jobject thiz,jlong pCore, jstring jUri) { const char* cUri=env->GetStringUTFChars(jUri, NULL); - LinphoneCall *call= (LinphoneCall *) linphone_core_find_call_from_uri((LinphoneCore *) pCore,cUri); + LinphoneCall *call=linphone_core_find_call_from_uri((LinphoneCore *) pCore,cUri); env->ReleaseStringUTFChars(jUri, cUri); LinphoneCoreData *lcdata=(LinphoneCoreData*)linphone_core_get_user_data((LinphoneCore*)pCore); return (jobject) lcdata->getCall(env,call); From ddf2dcc409428eeee94bef978cadfdb7758a06cc Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Wed, 17 Jul 2013 14:18:03 +0200 Subject: [PATCH 7/8] Updated ms2 --- mediastreamer2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mediastreamer2 b/mediastreamer2 index aebfe443e..407d6591e 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit aebfe443e91aa1e1c1e32b2410cc1d9a5db629c1 +Subproject commit 407d6591e14bf90816b88e7615408230136b3de5 From 53f7cedf0047ee73d5f0d2c823dfbe1297322cab Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 11 Jul 2013 13:36:56 +0200 Subject: [PATCH 8/8] Updated ms2 and android build to use renamed ffmepg libraries --- build/android/Android-no-neon.mk | 8 ++++---- build/android/Android.mk | 8 ++++---- .../org/linphone/core/LinphoneCoreFactoryImpl.java | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/build/android/Android-no-neon.mk b/build/android/Android-no-neon.mk index 39818fbf4..c1f9e7f05 100644 --- a/build/android/Android-no-neon.mk +++ b/build/android/Android-no-neon.mk @@ -27,10 +27,10 @@ include $(linphone-root-dir)/submodules/linphone/build/android/common.mk ifeq ($(LINPHONE_VIDEO),1) LOCAL_SHARED_LIBRARIES += \ - libavcodecnoneon \ - libswscale \ - libavcore \ - libavutil + liblinavcodecnoneon \ + liblinswscale \ + liblinavcore \ + liblinavutil endif LOCAL_MODULE := liblinphonenoneon diff --git a/build/android/Android.mk b/build/android/Android.mk index 0dc0bd041..645676ffc 100755 --- a/build/android/Android.mk +++ b/build/android/Android.mk @@ -27,10 +27,10 @@ include $(linphone-root-dir)/submodules/linphone/build/android/common.mk ifeq ($(LINPHONE_VIDEO),1) LOCAL_SHARED_LIBRARIES += \ - libavcodec \ - libswscale \ - libavcore \ - libavutil + liblinavcodec \ + liblinswscale \ + liblinavcore \ + liblinavutil endif LOCAL_MODULE := liblinphone diff --git a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java index 8cedba445..a8f9754ce 100644 --- a/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java +++ b/java/impl/org/linphone/core/LinphoneCoreFactoryImpl.java @@ -40,19 +40,19 @@ public class LinphoneCoreFactoryImpl extends LinphoneCoreFactory { static { // FFMPEG (audio/video) - loadOptionalLibrary("avutil"); - loadOptionalLibrary("swscale"); - loadOptionalLibrary("avcore"); + loadOptionalLibrary("linavutil"); + loadOptionalLibrary("linswscale"); + loadOptionalLibrary("linavcore"); System.loadLibrary("neon"); if (!hasNeonInCpuFeatures()) { - boolean noNeonLibrariesLoaded = loadOptionalLibrary("avcodecnoneon"); + boolean noNeonLibrariesLoaded = loadOptionalLibrary("linavcodecnoneon"); if (!noNeonLibrariesLoaded) { - loadOptionalLibrary("avcodec"); + loadOptionalLibrary("linavcodec"); } } else { - loadOptionalLibrary("avcodec"); + loadOptionalLibrary("linavcodec"); } // OPENSSL (cryptography)