Commit graph

10268 commits

Author SHA1 Message Date
Guillaume Beraudo
c6d0656905 Udate Android.mk of oRTP and mediastreamer2. 2011-10-20 15:37:38 +02:00
Simon Morlat
8b79e7232a Merge branch 'master' of git.linphone.org:linphone 2011-10-20 15:13:28 +02:00
Simon Morlat
7ea99b5a4c fix mute button that did not work anymore, fix missing symbols 2011-10-20 15:12:50 +02:00
Sylvain Berfini
ee341e2ec3 Merge 2011-10-20 11:40:15 +02:00
Sylvain Berfini
0e4136de34 Fix an issue with video when conferencing 2011-10-20 11:36:57 +02:00
Jehan Monnier
973953df07 update ms2 for SILK 2011-10-20 10:17:35 +02:00
Simon Morlat
4068795f5a remove redundant speaker_gain (playback_gain_db already exists) 2011-10-19 21:50:05 +02:00
Simon Morlat
949b3cd841 allow to force alsa sample rate 2011-10-19 21:14:08 +02:00
Pierre-Eric Pelloux-Prayer
8fcc886b10 Add options to linphonerc to activate speaker AGC 2011-10-19 17:05:43 +02:00
Jehan Monnier
6566c1179c update ms2 for IOS5 2011-10-19 11:35:51 +02:00
Simon Morlat
a2e512ba00 Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone 2011-10-19 11:05:38 +02:00
Simon Morlat
e4d9005398 Merge branch 'master' of git.linphone.org:linphone 2011-10-19 11:04:47 +02:00
Simon Morlat
7b3398d2ec implement and active adaptive rate control for audio & video. 2011-10-19 10:55:44 +02:00
Guillaume Beraudo
ebaa5f460d Ability to limit number of calls / hide transfers. 2011-10-18 15:44:35 +02:00
Guillaume Beraudo
324551708e Max calls limit (config, C, exposed to java) 2011-10-18 15:41:04 +02:00
Guillaume Beraudo
67daaaa14d Take a reference on android camera preview. 2011-10-17 15:09:50 +02:00
Sylvain Berfini
5360069196 Conference's pause/resume issue fixed 2011-10-14 17:36:44 +02:00
Guillaume Beraudo
e740628ab7 Update dependency. 2011-10-14 16:55:43 +02:00
Jehan Monnier
ba992227d5 update ISO audio for IOS 5 2011-10-14 16:06:27 +02:00
Simon Morlat
f04f19adde Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone 2011-10-13 15:59:55 +02:00
Simon Morlat
787e9d2a3d fix for early media and multi call 2011-10-13 15:59:23 +02:00
Guillaume Beraudo
02851b26f7 Merge branch 'master' of git.linphone.org:linphone-android into conferencing
Conflicts:
	src/org/linphone/LinphoneManager.java
	src/org/linphone/core/LinphoneCallParamsImpl.java
	src/org/linphone/core/LinphoneCoreImpl.java
	submodules/linphone
2011-10-13 15:57:22 +02:00
Pierre-Eric Pelloux-Prayer
a0f8cbb73c Update ms2 2011-10-13 13:44:24 +02:00
Simon Morlat
d855429ae3 update ms2 and ortp 2011-10-13 13:22:04 +02:00
Guillaume Beraudo
514f67a88a Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
Conflicts:
	mediastreamer2
	oRTP
2011-10-13 13:18:28 +02:00
Simon Morlat
cd66a94919 Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone 2011-10-13 12:38:41 +02:00
Simon Morlat
e19c87b9eb remove all TARGET_OS_IPHONE 2011-10-13 12:38:03 +02:00
Pierre-Eric Pelloux-Prayer
89cb3a385b Update ms2 2011-10-13 12:09:31 +02:00
Simon Morlat
3a5a469768 install pem file for mac os x and windows. 2011-10-13 11:50:51 +02:00
Simon Morlat
bb6a292ced Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone 2011-10-13 11:36:44 +02:00
Simon Morlat
ba323197df fix bugs in conferencing/multiple calls
save some config parameter sooner.
2011-10-13 11:36:09 +02:00
Sylvain Berfini
ee75282fac TLS certificates' issue on MacOSX fixed 2011-10-13 11:23:24 +02:00
Guillaume Beraudo
d0b53669f9 android: enable srtp
Conflicts:

	mediastreamer2
	oRTP
2011-10-13 10:59:09 +02:00
Guillaume Beraudo
01438658f4 srtp: take into account that ortp' srtp.h has been renamed ortp_srtp.h
Conflicts:

	coreapi/sal.h
	coreapi/sal_eXosip2_sdp.c
	mediastreamer2
	oRTP
2011-10-13 10:58:04 +02:00
Sylvain Berfini
0719db49d8 rootca.pem added in linphonecore 2011-10-13 10:28:24 +02:00
Guillaume Beraudo
c3ce65e802 Take a reference on the Android display window on set. 2011-10-12 14:01:59 +02:00
Simon Morlat
e50de2a2ef conferencing improvement, works in GTK ui. 2011-10-11 22:12:17 +02:00
Pierre-Eric Pelloux-Prayer
5becaaee29 srtp: add Javadoc for new API functions 2011-10-10 10:58:29 +02:00
Pierre-Eric Pelloux-Prayer
2c2f4cb921 Add media_encryption API JNI implementation 2011-10-10 10:30:44 +02:00
Pierre-Eric Pelloux-Prayer
641354c50f srtp: add Java impl 2011-10-10 09:26:40 +02:00
Pierre-Eric Pelloux-Prayer
fe3eaf6f2d srtp: add Java API 2011-10-10 09:02:07 +02:00
Simon Morlat
12bf9694a4 Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
Conflicts:
	coreapi/linphonecall.c
2011-10-07 16:33:13 +02:00
Simon Morlat
93cebd8f63 - decline incoming calls when there is already an incoming call or an outgoing call not yet established. 2011-10-07 16:25:41 +02:00
Guillaume Beraudo
382b6f480a Hide LinphonecallImpl constructor.
linphonecalls should not be created from java.
2011-10-07 14:46:12 +02:00
Guillaume Beraudo
0109d8680d findCallFromUri now returns an object. 2011-10-07 14:40:58 +02:00
Guillaume Beraudo
3ef3935785 Don't crash when terminating already terminated call. 2011-10-07 14:40:15 +02:00
Jehan Monnier
74f6492919 update ms2 2011-10-07 11:18:02 +02:00
Guillaume Beraudo
d8f8b82103 Enhance conference activity style + permute calls. 2011-10-07 10:15:46 +02:00
Guillaume Beraudo
490945660d JNI function getCall now returns a LinphoneCall. 2011-10-07 09:48:52 +02:00
Pierre-Eric Pelloux-Prayer
70f96ce8e9 Enable srtp 2011-10-07 08:51:50 +02:00