Commit graph

10268 commits

Author SHA1 Message Date
Ghislain MARY
d23ce6ed1e Update ortp and ms2 submodules. 2016-01-21 17:06:03 +01:00
Sandrine Avakian
db7eb97044 Updating mediastreamer2. Fixing too many parameters error in audio_assistant.
Now linphone-gtk is launching and lilblinphone-tester Single call suite is ok.
2016-01-21 16:49:00 +01:00
Sandrine Avakian
d961cb08c5 Fixing bug in ms_factory_voip_init. 2016-01-21 14:55:37 +01:00
Sylvain Berfini
bfc7630ada This should fix vcard tester 2016-01-21 14:40:00 +01:00
Sandrine Avakian
b8468a56a1 Attempt on fixing ring stream. 2016-01-21 13:20:19 +01:00
Sandrine Avakian
6fd92fdcf9 Fixes in gtk audio_assistant and property box. 2016-01-21 09:28:19 +01:00
Sandrine Avakian
de1ed36191 Merge branch 'master' of git.linphone.org:linphone into dev_msfactory
# Conflicts:
#	mediastreamer2
2016-01-21 09:18:36 +01:00
Sylvain Berfini
ca03bb1972 Fixed issue with ampersand in config dump 2016-01-20 17:33:23 +01:00
Jehan Monnier
46b34d978b -In case of mandatory encryption on, generate an iframe when encryption is done.
-ms2: ice fixes
2016-01-20 16:36:16 +01:00
Sandrine Avakian
3cf64721dd Propagating modifications in mediastreamer. 2016-01-20 15:17:36 +01:00
Sandrine Avakian
1f624ada80 Updating echo cancellation and adding MSFactory into Sal structure. 2016-01-20 15:12:12 +01:00
Brieuc Viel
86e7857431 Fix typo in JNI 2016-01-20 14:32:24 +01:00
Gautier Pelloux-Prayer
33be9d6193 quality_reporting.c: decrease logs intensity, there are not warnings at all 2016-01-20 14:03:56 +01:00
Gautier Pelloux-Prayer
8508f54357 linphonecall.c: remove unused code 2016-01-20 10:30:27 +01:00
Simon Morlat
655ad09f76 update ortp 2016-01-20 10:22:14 +01:00
Sandrine Avakian
e5632b3ee3 Merge branch 'master' of git.linphone.org:linphone into dev_msfactory
# Conflicts:
#	mediastreamer2
2016-01-20 09:04:11 +01:00
Simon Morlat
1a36ff6b96 fix android build 2016-01-19 17:50:37 +01:00
Simon Morlat
9a8ee6ddf5 update for new ortp logging api 2016-01-19 16:25:43 +01:00
Sandrine Avakian
a8d978c832 Small fixes for factory integration in linphonecall.c , misc.c and offeranswer.c . 2016-01-19 15:51:02 +01:00
Sandrine Avakian
ba2bb54e03 Merge branch 'master' of git.linphone.org:linphone into dev_msfactory 2016-01-19 15:47:26 +01:00
Jehan Monnier
fbc08fa148 update ortp 2016-01-19 15:39:31 +01:00
Jehan Monnier
2a455a5fc7 remove some warnings 2016-01-19 15:39:31 +01:00
Brieuc Viel
8b71cc1fc8 Fixes JNI crach around LinphoneConference constructor 2016-01-19 15:35:41 +01:00
Sylvain Berfini
f001aaae97 This should fix broken JNI compilation 2016-01-19 14:07:41 +01:00
Sandrine Avakian
48b10c1724 Update media streamer2 : text stream, ring stream, audio stream.
Adding declaration of void ms_factory_set_mtu  in factory.h.
Adding a getter linphone_core_get_factory(void *lc) in linphonecore.h.
2016-01-19 13:58:21 +01:00
Simon Morlat
2e42434290 prevent crash when call log has invalid URIso 2016-01-19 12:41:34 +01:00
Jehan Monnier
0d5ffa5086 No longer change remote destination when ice completed because already done in ms2 ice module 2016-01-19 12:21:35 +01:00
Sandrine Avakian
4dfdc930c3 Merge branch 'master' of git.linphone.org:linphone into dev_msfactory 2016-01-19 10:55:59 +01:00
François Grisez
7af7898ddd Fixes 'make install' with autotools 2016-01-19 10:55:55 +01:00
Sandrine Avakian
56a452a8f3 Update mediastreamer and player. 2016-01-19 10:54:09 +01:00
Sandrine Avakian
1afed9cd17 Propagating changes from conference and webcam in mediastreamer.
Updating conference as well in linphone.
2016-01-19 10:50:01 +01:00
Simon Morlat
d906f2dc5d factorize code, don't enable symmetric_rtp if ICE is used. 2016-01-18 17:21:53 +01:00
Sandrine Avakian
bbcbbc38d0 Merge branch 'master' of git.linphone.org:linphone into dev_msfactory 2016-01-18 14:05:37 +01:00
Gautier Pelloux-Prayer
67f9bd2068 linphonecore.c: since log level is a mask, do not compare with == operator but & instead 2016-01-18 13:31:26 +01:00
François Grisez
edfa2cc3e7 Updates ortp to fix some doxygen compilation issues 2016-01-18 12:11:50 +01:00
François Grisez
071581ffac Declare LinphoneConference and LinphoneConferenceParams in conference.h instead of linphonecore.h 2016-01-18 12:03:53 +01:00
Simon Morlat
fcadf804eb fix test that sometimes crashes when call is not established 2016-01-18 11:20:19 +01:00
Sylvain Berfini
4583352bad Merge branch 'master' into dev_vcard
Conflicts:
	coreapi/Makefile.am
	coreapi/conference.h
2016-01-18 11:14:56 +01:00
Simon Morlat
e8f41de8b7 update ortp 2016-01-18 11:10:16 +01:00
Simon Morlat
23a48fa8db update ms2 2016-01-18 11:06:55 +01:00
Sylvain Berfini
63ec344f3b Updated CMakeLists to easy merge with master 2016-01-18 10:42:57 +01:00
Simon Morlat
d0e27e4e1a update ms2 and ortp 2016-01-15 22:04:41 +01:00
Simon Morlat
2a6213d90c prepare the removal of a=nortpproxy attribute for ICE reINVITE. 2016-01-15 21:59:13 +01:00
Simon Morlat
b86952810c improve loggin of an error case 2016-01-15 21:59:13 +01:00
Sandrine Avakian
16bf6b1563 Updating linphone with mediastreamer2. 2016-01-15 16:45:25 +01:00
Sylvain Berfini
6ddff7e1fd Fix compil issue with cmake builder 2016-01-15 16:44:03 +01:00
Sandrine Avakian
570266ea36 First changes to have the LinphoneCore instance own the factory object instead of sharing
it through a static variable.
2016-01-15 16:39:27 +01:00
Sylvain Berfini
9502d14f61 Fix call from gtk app to not public symbol 2016-01-15 16:12:04 +01:00
Jehan Monnier
a1c8d9f99c make sure in case of SRTP DTLS enabled, ice reinvite is disabled & mandatory encryption is activated 2016-01-15 15:36:38 +01:00
Sylvain Berfini
d31bd8dd77 Few fixes 2016-01-15 14:37:55 +01:00