From 6d8b3945a6c59d23f12dc083dba34109027d502f Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Wed, 19 Jun 2013 15:06:30 +0200 Subject: [PATCH] repair liblinphone_tester --- Makefile | 10 +-- liblinphone_tester/ant.properties | 2 +- liblinphone_tester/res/raw/laure_rc | 42 ------------- liblinphone_tester/res/raw/marie_early_rc | 45 -------------- liblinphone_tester/res/raw/marie_rc | 47 -------------- liblinphone_tester/res/raw/multi_account_lrc | 61 ------------------- liblinphone_tester/res/raw/pauline_rc | 46 -------------- .../src/org/linphone/tester/MainActivity.java | 3 + .../src/org/linphone/tester/Tester.java | 44 ++----------- submodules/linphone | 2 +- 10 files changed, 17 insertions(+), 285 deletions(-) delete mode 100644 liblinphone_tester/res/raw/laure_rc delete mode 100644 liblinphone_tester/res/raw/marie_early_rc delete mode 100644 liblinphone_tester/res/raw/marie_rc delete mode 100644 liblinphone_tester/res/raw/multi_account_lrc delete mode 100644 liblinphone_tester/res/raw/pauline_rc diff --git a/Makefile b/Makefile index 3ce7fe652..44fb8424a 100644 --- a/Makefile +++ b/Makefile @@ -116,11 +116,13 @@ prepare-cunit: $(TOPDIR)/submodules/externals/cunit/CUnit/Headers/*.h [ -d $(TOPDIR)/submodules/externals/build/cunit/CUnit ] || mkdir $(TOPDIR)/submodules/externals/build/cunit/CUnit cp $^ $(TOPDIR)/submodules/externals/build/cunit/CUnit -prepare-liblinphone_tester: $(TOPDIR)/submodules/linphone/tester/*_lrc $(TOPDIR)/submodules/linphone/tester/*_rc -# [ -d $(TOPDIR)/liblinphone_tester/res/raw ] || mkdir $(TOPDIR)/liblinphone_tester/res/raw -# cp $^ $(TOPDIR)/liblinphone_tester/res/raw +$(TOPDIR)/res/raw/rootca.pem: + $(TOPDIR)/submodules/linphone/share/scripts/mk-ca-bundle.pl $@ -prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-srtp prepare-mediastreamer2 prepare-antlr3 prepare-belle-sip +prepare-liblinphone_tester: $(TOPDIR)/submodules/linphone/tester/*_lrc $(TOPDIR)/submodules/linphone/tester/*_rc $(TOPDIR)/submodules/linphone/tester/tester_hosts $(TOPDIR)/submodules/linphone/tester/certificates/* $(TOPDIR)/res/raw/rootca.pem + cp -f $^ $(TOPDIR)/liblinphone_tester/res/raw/. + +prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-srtp prepare-mediastreamer2 prepare-antlr3 prepare-belle-sip $(TOPDIR)/res/raw/rootca.pem LIBLINPHONE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) LINPHONE_VERSION=$(LINPHONE_VERSION) BUILD_UPNP=$(BUILD_UPNP) BUILD_REMOTE_PROVISIONING=$(BUILD_REMOTE_PROVISIONING) BUILD_X264=$(BUILD_X264) BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_TUNNEL=$(BUILD_TUNNEL) BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_FOR_X86=$(BUILD_FOR_X86) USE_JAVAH=$(USE_JAVAH) BUILD_TLS=$(BUILD_TLS) diff --git a/liblinphone_tester/ant.properties b/liblinphone_tester/ant.properties index 9c05ba1c8..c3a2c6428 100644 --- a/liblinphone_tester/ant.properties +++ b/liblinphone_tester/ant.properties @@ -1 +1 @@ -source.dir=src:../submodules/linphone/mediastreamer2/java/src +source.dir=src:../submodules/linphone/mediastreamer2/java/src:../submodules/linphone/java/j2se:../submodules/linphone/java/common:../submodules/linphone/java/impl diff --git a/liblinphone_tester/res/raw/laure_rc b/liblinphone_tester/res/raw/laure_rc deleted file mode 100644 index 443c4e918..000000000 --- a/liblinphone_tester/res/raw/laure_rc +++ /dev/null @@ -1,42 +0,0 @@ -[net] -mtu=1300 - -[sip] -sip_port=5092 -sip_tcp_port=5092 -sip_tls_port=5093 -default_proxy=0 -ping_with_options=0 -register_only_when_network_is_up=0 - -[auth_info_0] -username=laure -userid=laure -passwd=secret -realm="sip.example.org" - - -[proxy_0] -reg_proxy=sip2.linphone.org -reg_route=sip2.linphone.org -reg_identity=sip:laure@sip.example.org -reg_expires=3600 -reg_sendregister=1 -publish=0 -dial_escape_plus=0 - - -[rtp] -audio_rtp_port=9010 -video_rtp_port=9012 - -[video] -display=0 -capture=0 -show_local=0 -size=vga -enabled=0 -self_view=0 -automatically_initiate=0 -automatically_accept=0 -device=StaticImage: Static picture \ No newline at end of file diff --git a/liblinphone_tester/res/raw/marie_early_rc b/liblinphone_tester/res/raw/marie_early_rc deleted file mode 100644 index bb603a738..000000000 --- a/liblinphone_tester/res/raw/marie_early_rc +++ /dev/null @@ -1,45 +0,0 @@ -[sip] -sip_port=5082 -sip_tcp_port=5082 -sip_tls_port=5083 -default_proxy=0 -ping_with_options=0 -register_only_when_network_is_up=0 -incoming_calls_early_media=1 - -[auth_info_0] -username=marie -userid=marie -passwd=secret -realm="sip.example.org" - - -[proxy_0] -reg_proxy=sip2.linphone.org;transport=tcp -reg_route=sip2.linphone.org;transport=tcp;lr -reg_identity=sip:marie@sip.example.org -reg_expires=3600 -reg_sendregister=1 -publish=0 -dial_escape_plus=0 - -[friend_0] -url="Paupoche" -pol=accept -subscribe=0 - - -[rtp] -audio_rtp_port=8070 -video_rtp_port=8072 - -[video] -display=0 -capture=0 -show_local=0 -size=vga -enabled=0 -self_view=0 -automatically_initiate=0 -automatically_accept=0 -device=StaticImage: Static picture diff --git a/liblinphone_tester/res/raw/marie_rc b/liblinphone_tester/res/raw/marie_rc deleted file mode 100644 index d8b74a1e1..000000000 --- a/liblinphone_tester/res/raw/marie_rc +++ /dev/null @@ -1,47 +0,0 @@ -[net] -mtu=1300 - -[sip] -sip_port=5082 -sip_tcp_port=5082 -sip_tls_port=5083 -default_proxy=0 -ping_with_options=0 -register_only_when_network_is_up=0 - -[auth_info_0] -username=marie -userid=marie -passwd=secret -realm="sip.example.org" - - -[proxy_0] -reg_proxy=sip2.linphone.org;transport=tcp -reg_route=sip2.linphone.org;transport=tcp;lr -reg_identity=sip:marie@sip.example.org -reg_expires=3600 -reg_sendregister=1 -publish=0 -dial_escape_plus=0 - -[friend_0] -url="Paupoche" -pol=accept -subscribe=0 - - -[rtp] -audio_rtp_port=8070 -video_rtp_port=8072 - -[video] -display=0 -capture=0 -show_local=0 -size=vga -enabled=0 -self_view=0 -automatically_initiate=0 -automatically_accept=0 -device=StaticImage: Static picture diff --git a/liblinphone_tester/res/raw/multi_account_lrc b/liblinphone_tester/res/raw/multi_account_lrc deleted file mode 100644 index ea24951a3..000000000 --- a/liblinphone_tester/res/raw/multi_account_lrc +++ /dev/null @@ -1,61 +0,0 @@ -[net] -mtu=1300 - -[sip] -sip_port=5072 -sip_tcp_port=5072 -sip_tls_port=5073 -default_proxy=0 - -[auth_info_0] -username=liblinphone_tester -userid=liblinphone_tester -passwd=secret -realm="auth.example.org" - -[auth_info_1] -username=pauline -userid=pauline -passwd=secret -realm="sip.example.org" - -[auth_info_2] -username=liblinphone_tester -userid=liblinphone_tester -passwd=secret -realm="auth1.example.org" - -[auth_info_3] -username=marie -userid=marie -passwd=secret -realm="sip.example.org" - -[proxy_0] -reg_proxy=sip2.linphone.org -reg_route=sip2.linphone.org -reg_identity=sip:pauline@sip.example.org -reg_expires=3600 -reg_sendregister=1 -publish=0 -dial_escape_plus=0 - -[proxy_1] -reg_proxy=sip2.linphone.org;transport=tcp -reg_route=sip2.linphone.org;transport=tcp -reg_identity=sip:marie@sip.example.org -reg_expires=3600 -reg_sendregister=1 -publish=0 -dial_escape_plus=0 - -[proxy_2] -reg_proxy=sip2.linphone.org -reg_route=sip2.linphone.org -reg_identity=sip:liblinphone_tester@auth1.example.org -reg_expires=3600 -reg_sendregister=1 -publish=0 -dial_escape_plus=0 - - diff --git a/liblinphone_tester/res/raw/pauline_rc b/liblinphone_tester/res/raw/pauline_rc deleted file mode 100644 index eb588cfc6..000000000 --- a/liblinphone_tester/res/raw/pauline_rc +++ /dev/null @@ -1,46 +0,0 @@ -[net] -mtu=1300 - -[sip] -sip_port=5072 -sip_tcp_port=5072 -sip_tls_port=5073 -default_proxy=0 -ping_with_options=0 -register_only_when_network_is_up=0 - -[auth_info_0] -username=pauline -userid=pauline -passwd=secret -realm="sip.example.org" - - -[proxy_0] -reg_proxy=sip2.linphone.org;transport=tcp -reg_route=sip2.linphone.org;transport=tcp;lr -reg_identity=sip:pauline@sip.example.org -reg_expires=3600 -reg_sendregister=1 -publish=0 -dial_escape_plus=0 - -#[friend_0] -#url="Mariette" -#pol=accept -#subscribe=0 - -[rtp] -audio_rtp_port=8090 -video_rtp_port=8092 - -[video] -display=0 -capture=0 -show_local=0 -size=vga -enabled=0 -self_view=0 -automatically_initiate=0 -automatically_accept=0 -device=StaticImage: Static picture \ No newline at end of file diff --git a/liblinphone_tester/src/org/linphone/tester/MainActivity.java b/liblinphone_tester/src/org/linphone/tester/MainActivity.java index da1aa5bc8..9d15fecd9 100644 --- a/liblinphone_tester/src/org/linphone/tester/MainActivity.java +++ b/liblinphone_tester/src/org/linphone/tester/MainActivity.java @@ -38,6 +38,9 @@ public class MainActivity extends Activity { copyFromPackage(R.raw.marie_early_rc, new File("marie_early_rc").getName()); copyFromPackage(R.raw.multi_account_lrc, new File("multi_account_lrc").getName()); copyFromPackage(R.raw.pauline_rc, new File("pauline_rc").getName()); + copyFromPackage(R.raw.rootca, new File("rootca.pem").getName()); + copyFromPackage(R.raw.cacert, new File("cacert.pem").getName()); + copyFromPackage(R.raw.tester_hosts, new File("tester_hosts").getName()); } catch (IOException e) { e.printStackTrace(); } diff --git a/liblinphone_tester/src/org/linphone/tester/Tester.java b/liblinphone_tester/src/org/linphone/tester/Tester.java index 5a2941e6a..7f2a925c2 100644 --- a/liblinphone_tester/src/org/linphone/tester/Tester.java +++ b/liblinphone_tester/src/org/linphone/tester/Tester.java @@ -1,7 +1,9 @@ package org.linphone.tester; -import org.linphone.mediastream.CpuUtils; +import org.linphone.core.LinphoneCoreFactory; + import org.linphone.mediastream.Version; +import org.linphone.mediastream.CpuUtils; import android.util.Log; @@ -28,37 +30,8 @@ public class Tester { return System.getProperty("os.arch").contains("armv7"); } - static { - // FFMPEG (audio/video) - loadOptionalLibrary("avutil"); - loadOptionalLibrary("swscale"); - loadOptionalLibrary("avcore"); - - System.loadLibrary("neon"); - - if (!hasNeonInCpuFeatures()) { - boolean noNeonLibrariesLoaded = loadOptionalLibrary("avcodecnoneon"); - if (!noNeonLibrariesLoaded) { - loadOptionalLibrary("avcodec"); - } - } else { - loadOptionalLibrary("avcodec"); - } - - // OPENSSL (cryptography) - // lin prefix avoids collision with libs in /system/lib - loadOptionalLibrary("lincrypto"); - loadOptionalLibrary("linssl"); - - // Secure RTP and key negotiation - loadOptionalLibrary("srtp"); - loadOptionalLibrary("zrtpcpp"); // GPLv3+ - - // Tunnel - loadOptionalLibrary("tunnelclient"); - - // g729 A implementation - loadOptionalLibrary("bcg729"); + static { + LinphoneCoreFactory.instance(); System.loadLibrary("cunit"); @@ -66,20 +39,15 @@ public class Tester { if (!hasNeonInCpuFeatures()) { try { if (!isArmv7() && !Version.isX86()) { - System.loadLibrary("linphonearmv5"); System.loadLibrary("linphone_testerarmv5"); } else { - System.loadLibrary("linphonenoneon"); System.loadLibrary("linphone_testernoneon"); } - Log.w("linphone", "No-neon liblinphone loaded"); } catch (UnsatisfiedLinkError ule) { - Log.w("linphone", "Failed to load no-neon liblinphone, loading neon liblinphone"); - System.loadLibrary("linphone"); + Log.w("linphone", "Failed to load no-neon liblinphone_tester, loading neon liblinphone_tester"); System.loadLibrary("linphone_tester"); } } else { - System.loadLibrary("linphone"); System.loadLibrary("linphone_tester"); } diff --git a/submodules/linphone b/submodules/linphone index ad406033c..0c4216948 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit ad406033c0f2043d2a3bf73f5b8c8204c48c35a5 +Subproject commit 0c4216948db781fb1cdc7cb9729997e347cd080a