Commit graph

107 commits

Author SHA1 Message Date
Sylvain Berfini
75934a5400 Merge remote-tracking branch 'master/master' into bellesip
Conflicts:
	.classpath
	res/values/non_localizable_custom.xml
	res/values/strings.xml
	src/org/linphone/HistoryDetailFragment.java
	submodules/linphone
2013-06-12 10:59:39 +02:00
Ghislain MARY
aff3a5ef3e Update libvpx to v1.2.0. 2013-06-06 15:42:44 +02:00
Simon Morlat
2be1e8c9e5 change polarssl repo to git.linphone.org. It contains a fix preventing endless loop on ARM devices. 2013-04-30 21:55:20 +02:00
Simon Morlat
15ed1fed59 Merge remote-tracking branch 'public/master' into bellesip
Conflicts:
	jni/Application.mk
	submodules/linphone
2013-04-28 16:18:47 +02:00
Simon Morlat
a2287b9ed0 build libxml2 statically
rename it to liblpxml2 (libxml2 is part of android system already).
2013-04-24 11:59:32 +02:00
Jehan Monnier
cf54476fd3 statically link remote provisionning stuf to liblinphone 2013-04-10 17:28:34 +02:00
Simon Morlat
9eb3eec1be integrate polarssl to linphone-android.
update srtp, necessary to avoid symbol conflict.
2013-03-28 17:19:11 +01:00
Sylvain Berfini
b8efe25a78 Merge remote-tracking branch 'master/master' into bellesip
Conflicts:
	.gitmodules
	src/org/linphone/AccountPreferencesFragment.java
	submodules/linphone
2013-03-22 12:08:46 +01:00
Guillaume Beraudo
9e3f8df44d Use submodule for aXMLRPC. 2013-03-18 12:38:41 +01:00
Jehan Monnier
36548188af update submodules 2013-03-12 16:02:19 +01:00
Yann Diorcet
260e078c6e Add suites and tests in liblinphone_tester 2013-03-08 16:09:35 +01:00
Yann Diorcet
894581b6d2 Add liblinphone tester project 2013-03-07 17:35:05 +01:00
Yann Diorcet
bfc8d392e2 Merge branch 'master' of git.linphone.org:linphone-android into bellesip
Conflicts:
	.gitmodules
	submodules/linphone
2013-02-13 17:26:07 +01:00
Yann Diorcet
1b98d34e9a Add libupnp dependency for Android 2013-02-13 16:53:50 +01:00
Simon Morlat
b47c9cce0a update exosip and linphone 2013-02-08 17:29:41 +01:00
Yann Diorcet
188fa09cf4 Merge branch 'master' into bellesip
Conflicts:
	.gitmodules
	Makefile
	submodules/externals/build/exosip/Android.mk
	submodules/externals/exosip
	submodules/linphone
2013-02-06 12:22:28 +01:00
Yann Diorcet
72b10a1f32 Add xml2lpc/lpc2xml support and remote provisioning 2013-02-05 10:04:00 +01:00
Sylvain Berfini
707a9ec110 Increased socket progress timeout from 1s to 5s in exosip + remove -D from Makefile 2013-01-29 13:59:07 +01:00
Yann Diorcet
0fd4a38909 Replace eXosip/osip by belle-sip
add a checktools utility
Add belle-sip
Add antlr3c
2013-01-23 14:08:55 +01:00
Ghislain MARY
df0305cb43 Add missing file. 2012-11-15 15:54:48 +01:00
Ghislain MARY
6a50d4c8fc Update webrtc submodule to fix crashes with neon. 2012-11-14 11:49:50 +01:00
Ghislain MARY
b625901bc2 Add WebRTC echo canceller. 2012-11-13 17:15:56 +01:00
Simon Morlat
a44fa3dadb upgrade openssl version, to see if it fixes SSL disconnection bugs. 2012-09-26 22:31:34 +02:00
Simon Morlat
0fb7508ee4 update exosip for SSL_ERROR_SYSCALL bugfix 2012-09-13 14:13:23 +02:00
Sylvain Berfini
e20cfcc2a5 Updated test app and submodules 2012-09-10 14:30:20 +02:00
Simon Morlat
63bd66d88a update linphone submodule, add new interface for chat. 2012-09-05 11:52:18 +02:00
Sylvain Berfini
7e59dbd476 Add jpeg encoder to no-neon ffmpeg 2012-08-29 11:21:38 +02:00
Ghislain MARY
b63a49ae31 Update openssl and linphone submodules. 2012-08-22 09:41:09 +02:00
Jehan Monnier
aa73594d2e update exosip
set tcp connection timout to 1s
2012-07-19 17:27:16 +02:00
Jehan Monnier
6d168d368f fix resampling issue for 48khz 2012-07-11 17:34:31 +02:00
Sylvain Berfini
ae89238ff9 Added MJPEG encoder to ffmepg to be able to take snapshots 2012-06-29 09:53:20 +02:00
Sylvain Berfini
5afbeec92b Updated libs compilation 2012-05-23 17:38:16 +02:00
Simon Morlat
57e0fdc4fe update exosip (use nodelay for tls too) 2012-05-22 15:45:40 +02:00
Simon Morlat
44b754f024 update exosip2 to use TCP_NODELAY 2012-05-22 14:20:16 +02:00
Guillaume Beraudo
90218aa051 Depend on exosip with tcp/tls connection reuse. 2012-05-15 09:56:33 +02:00
Guillaume Beraudo
f2680e14c5 Fix socket creation for multi-ip hosts (TCP/TLS). 2012-05-11 12:15:08 +02:00
Sylvain Berfini
b00b01840f Fix android compilation issue with updated srtp 2012-04-27 17:57:15 +02:00
Sylvain Berfini
5f6ff06d52 Fix srtp issue 2012-04-27 17:28:34 +02:00
Sylvain Berfini
adcc6657bc Merge branch 'tablet' 2012-04-27 15:46:41 +02:00
Sylvain Berfini
81fc525350 Fix last issue with pause + fix shared libs without neon problem 2012-04-17 16:57:37 +02:00
Sylvain Berfini
92455847e9 Temporary fix pause crash, todo: compile both ffmepg and choose the right one 2012-04-17 12:09:21 +02:00
Simon Morlat
9972f63f14 update linphone and set exosip to correct revision 2012-04-04 17:41:21 +02:00
Pierre-Eric Pelloux-Prayer
8df7709ac9 Fix Android build 2012-04-03 15:08:31 +02:00
Sylvain Berfini
c259d2cde6 Fix compilation issues 2012-04-02 12:24:31 +02:00
Sylvain Berfini
270e894752 fix some compilation issues 2012-03-29 15:59:31 +02:00
Sylvain Berfini
e9b307a18a Fix multithreading with vp8 2012-03-29 13:46:25 +02:00
Sylvain Berfini
2f7d1473b6 Added multicore option for MS 2012-03-22 16:50:42 +01:00
Pierre-Eric Pelloux-Prayer
f3e55fa6de Update linphone and exosip 2012-03-02 16:59:48 +01:00
Sylvain Berfini
bd60ad4276 Update exosip & linphone submodule + using setVideoPolicy 2012-03-01 12:14:15 +01:00
Yann Diorcet
1e9bef5a9d Fix AMRNB light compilation and use updated msamr codec 2012-01-27 13:57:06 +01:00