From 6d168d368ff2a1b3008b7f41f7b9e27e762617d4 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Wed, 11 Jul 2012 17:34:31 +0200 Subject: [PATCH 1/4] fix resampling issue for 48khz --- submodules/externals/speex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/externals/speex b/submodules/externals/speex index 7657e4041..0aa712946 160000 --- a/submodules/externals/speex +++ b/submodules/externals/speex @@ -1 +1 @@ -Subproject commit 7657e404191ce939f79fc571008272b411b52089 +Subproject commit 0aa712946869bc6faba5ada29d0d4a2b4a702b46 From af6fdb0b787fe6f14c9b1e61ba293a7eb5ac9623 Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 12 Jul 2012 16:17:13 +0200 Subject: [PATCH 2/4] Updated Makefile to generate empty default.properties file --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 78a934236..87c875628 100644 --- a/Makefile +++ b/Makefile @@ -54,6 +54,7 @@ update-project: $(SDK_PATH)/android update project --path . echo "key.store=$(KEYSTORE)" > ant.properties echo "key.alias=$(KEYALIAS)" >> ant.properties + touch default.properties generate-apk: ant debug From aa73594d2e57ace95f7977d060b4fa0de88f1297 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 19 Jul 2012 13:41:22 +0200 Subject: [PATCH 3/4] update exosip set tcp connection timout to 1s --- src/org/linphone/LinphoneManager.java | 5 ++++- submodules/externals/build/exosip/Android.mk | 4 ++-- submodules/externals/exosip | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java index 626108937..f20ebba61 100644 --- a/src/org/linphone/LinphoneManager.java +++ b/src/org/linphone/LinphoneManager.java @@ -736,7 +736,10 @@ public final class LinphoneManager implements LinphoneCoreListener { Transports ports = new Transports(t); boolean useStandardPort = getPrefBoolean(R.string.pref_transport_use_standard_ports_key, false); int lPreviousPort = ports.tcp +ports.udp +ports.tls; // assume only one port is active - + if (lPreviousPort>0xFFFF) { + Log.e("Bad port number ["+lPreviousPort+"] using random instead"); + lPreviousPort=(0xDFFF & (int)Math.random())+1024; + } if (!getPrefBoolean(R.string.pref_transport_tcp_key, false)) { ports.tcp = 0; } else if (useStandardPort) { diff --git a/submodules/externals/build/exosip/Android.mk b/submodules/externals/build/exosip/Android.mk index 70639065f..761e2ef2c 100755 --- a/submodules/externals/build/exosip/Android.mk +++ b/submodules/externals/build/exosip/Android.mk @@ -51,14 +51,14 @@ LOCAL_SRC_FILES += \ src/eXrefer_api.c \ src/jpublish.c \ src/sdp_offans.c - +#SOCKET_PROGRESS_TIMEOUT=1000 to take care of edge network LOCAL_CFLAGS += \ -UHAVE_CONFIG_H \ -include $(LOCAL_PATH)/../build/exosip/libeXosip2_AndroidConfig.h \ -DOSIP_MT \ -DENABLE_TRACE \ -DSOCKET_TIMEOUT=50 \ - -DSOCKET_PROGRESS_TIMEOUT=300 \ + -DSOCKET_PROGRESS_TIMEOUT=1000 \ -include $(LOCAL_PATH)/include/eXosip2/eXosip_transport_hook.h diff --git a/submodules/externals/exosip b/submodules/externals/exosip index 8c42924ae..05978321c 160000 --- a/submodules/externals/exosip +++ b/submodules/externals/exosip @@ -1 +1 @@ -Subproject commit 8c42924ae9009f6003e98d29638e078ca1bd7c71 +Subproject commit 05978321cfc73a91a12c2a818a45a308f3f55a47 From 63a050c1c5167a58a4103d218ebf8caf62c4d8bd Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 19 Jul 2012 14:47:25 +0200 Subject: [PATCH 4/4] update linphone --- submodules/linphone | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/linphone b/submodules/linphone index 9496394c8..c4bf7958a 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit 9496394c88dbdf6e6dd120b5657a2846b603d612 +Subproject commit c4bf7958ab6272155547c1f12e06189e1f84275c