Commit graph

10029 commits

Author SHA1 Message Date
Simon Morlat
a60b590c6f update ms2 2010-12-14 12:35:25 +01:00
Guillaume Beraudo
013e835343 Merge branch 'video' of git.linphone.org:linphone-android-private
Conflicts:
	libs/armeabi-v7a/liblinphone.so
	libs/armeabi/liblinphone.so
	src/org/linphone/core/LinphoneCallImpl.java
	src/org/linphone/core/LinphoneProxyConfigImpl.java
	src/org/linphone/core/tutorials/TutorialRegistrationActivity.java
	submodules/linphone
2010-12-14 09:32:47 +01:00
Simon Morlat
de0d399e98 disable e-c on android when there is a video stream 2010-12-13 21:18:24 +01:00
Guillaume Beraudo
6ff25215be Merge branch 'master' of git.linphone.org:linphone-private 2010-12-13 16:49:00 +01:00
Guillaume Beraudo
903fc38a91 Merge 2010-12-13 16:48:42 +01:00
Simon Morlat
f514eb5e80 Merge branch 'master' of belledonne-communications.com:linphone-private 2010-12-13 16:35:54 +01:00
Simon Morlat
9ed05b7ce3 fix crash 2010-12-13 16:35:39 +01:00
Guillaume Beraudo
294265ec27 Merge branch 'master' of git.linphone.org:linphone-android-private
Conflicts:
	src/org/linphone/core/LinphoneProxyConfigImpl.java
2010-12-13 16:11:01 +01:00
Guillaume Beraudo
7bb0ca7e4c Attach video for android. 2010-12-13 16:02:02 +01:00
Guillaume Beraudo
b9aea82101 Merge branch 'master' of git.linphone.org:linphone-android 2010-12-13 15:22:11 +01:00
Guillaume Beraudo
aa289edda1 Bind proxyconfig properties and update registration tutorial. 2010-12-13 15:21:12 +01:00
Guillaume Beraudo
36493970e5 Merge commit '2e953b4'
Conflicts:
	coreapi/help/java/org/linphone/core/tutorials/TutorialRegistration.java
	coreapi/linphonecore_jni.cc
2010-12-13 15:08:31 +01:00
Guillaume Beraudo
2e953b44c8 Bind expires and getstate from proxyconfig.
Update registration tutorial to manually unregister and re register.
2010-12-13 14:51:12 +01:00
Simon Morlat
53be75eda6 bugfixes again for bandwidth management 2010-12-13 14:36:11 +01:00
Simon Morlat
e5e5c3637b Merge branch 'master' of belledonne-communications.com:linphone-private 2010-12-13 14:24:54 +01:00
Simon Morlat
7b835688e1 bugfixes in bw 2010-12-13 14:24:33 +01:00
Guillaume Beraudo
f2acf7a8e8 Merge branch 'master' of git.linphone.org:linphone-private 2010-12-13 14:09:52 +01:00
Guillaume Beraudo
4a836da794 Change iterate on sal in iterate on linphonecore.
This causes hang on destroy.
2010-12-13 14:08:55 +01:00
Guillaume Beraudo
e2c691ed35 Add unregistration. 2010-12-13 14:08:12 +01:00
Guillaume Beraudo
1a18fe6207 Rotate information according to cameraId. 2010-12-13 14:04:38 +01:00
Simon Morlat
ff08abbb6a improvements in bandwidth management 2010-12-13 13:42:39 +01:00
Simon Morlat
0c98e9b8f6 Merge branch 'master' of belledonne-communications.com:linphone-private 2010-12-13 10:57:52 +01:00
Simon Morlat
16972baf9c rework bandwidth management 2010-12-13 10:57:41 +01:00
Guillaume Beraudo
173c7f3d9f Removed unused function. 2010-12-13 10:53:42 +01:00
Simon Morlat
bbdc548d74 fix orientation in 2.2 2010-12-10 16:42:04 +01:00
Jehan Monnier
45934f35c0 Merge branch 'master' of git.linphone.org:linphone-private 2010-12-10 16:38:17 +01:00
Jehan Monnier
845b5e9716 change libspeex link order 2010-12-10 16:37:29 +01:00
Guillaume Beraudo
2961330867 Capture preview is now dynamically resized to fit Linphonecore preferredVideoSize. 2010-12-09 22:52:27 +01:00
Guillaume Beraudo
5299f13ead Removed some compiler warnings. 2010-12-09 22:35:39 +01:00
Guillaume Beraudo
74096f25ba Refactor code to use the new InviteManager which in turn
uses the Bandwidth and Camera managers.
Improved front camera support.
2010-12-09 16:09:38 +01:00
Guillaume Beraudo
e76588265b Added convenient methods isPortrait(), createInverted() 2010-12-09 16:06:58 +01:00
Guillaume Beraudo
90a5674b97 Preliminary support for front camera. 2010-12-09 09:13:12 +01:00
Guillaume Beraudo
684c6fa545 Jni bindings for LinphoneCallParams 2010-12-09 09:12:22 +01:00
Guillaume Beraudo
5566daf9b1 Fixed and improved video test. 2010-12-09 09:08:12 +01:00
Guillaume Beraudo
41c5eaa945 Add audio bandwidth limitation binding. 2010-12-08 13:29:49 +01:00
Guillaume Beraudo
93df6ec5b0 Simplify registration tutorial. 2010-12-07 10:33:59 +01:00
Guillaume Beraudo
16749d14d3 Simplify registration tutorial. 2010-12-07 10:32:52 +01:00
Guillaume Beraudo
2b829b72b6 Fixed unimplemented methods.
Full brightness on videocall activity.
2010-12-06 15:06:59 +01:00
Guillaume Beraudo
77745099ba Fixed current CallParams not copied.
Fixed not always sending static image on camera muted.
Improved organization of preference activity.
2010-12-06 14:31:49 +01:00
Guillaume Beraudo
9fc45b9900 Merge branch 'master' of git.linphone.org:linphone-private 2010-12-06 14:29:11 +01:00
Guillaume Beraudo
209f768036 New attribute current_params in linphonecall to differenciate expected params and effective ones.
Fixed JNI binding for LinphoneCallParams to always copy the params and autodestroy in finalize.
2010-12-06 14:23:19 +01:00
Jehan Monnier
289140257f fix unimplemented method 2010-12-06 12:16:23 +01:00
Jehan Monnier
7adf2c94b8 implement enablePublish 2010-12-06 11:40:28 +01:00
Jehan Monnier
b75917753c fix wrong mediastreamer2 2010-12-06 11:37:19 +01:00
Jehan Monnier
b70ea12149 Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone 2010-12-06 11:36:55 +01:00
Jehan Monnier
d4f46e890d add enablePubish java binding 2010-12-06 11:36:19 +01:00
Guillaume Beraudo
6df330a6b4 Add video codecs preference. Integrate JNI code for getting list of available video codecs. 2010-12-03 16:13:01 +01:00
Guillaume Beraudo
8b3112cca8 Export video codecs list through JNI. 2010-12-03 16:11:05 +01:00
Jehan Monnier
340f723886 Merge branch 'master' of git.linphone.org:linphone-private 2010-12-03 10:04:15 +01:00
Jehan Monnier
ffb978db26 add proxy support to buddy_status tutorial 2010-12-03 10:02:29 +01:00