Commit graph

6653 commits

Author SHA1 Message Date
Guillaume Beraudo
31492d23e5 Lower amplitude of "on hold" music.
Especially necessary when remote is using earpiece like
in most phone call use cases.
2011-12-02 14:29:20 +01:00
Guillaume Beraudo
36ecc073c2 Get GL rendering synchronize and checks in mediastreamer2. 2011-12-02 13:58:51 +01:00
Simon Morlat
27891569dd fix oRTP and ms2 (build broken with doxygen) 2011-12-01 22:47:02 +01:00
Guillaume Beraudo
b59cdd29c0 Handle conference and on hold music.
When hosting a conference, mute conference participant when he
pauses us to prevent his holding music to be played to all participants.

When resuming a call, stop immediately sending the hold music,
even before receiving the 200OK. When the paused call is a conference,
it prevents the conference participants to hear the hold music while
the 200OK is back.
2011-12-01 15:48:22 +01:00
Guillaume Beraudo
a829a84f6d Play sound to other part when holding call. 2011-12-01 08:51:48 +01:00
Guillaume Beraudo
6892c98ccd JNI for setting file to play while on hold. 2011-12-01 08:36:03 +01:00
Pierre-Eric Pelloux-Prayer
657d19168c Update ms2 2011-11-30 11:37:21 +01:00
Guillaume Beraudo
28ad8e0e04 Factoring, visibility and security checks in wizard. 2011-11-29 17:10:05 +01:00
Sylvain Berfini
be4e74d208 Wizard 2011-11-29 10:40:35 +01:00
Jehan Monnier
28a1f62e26 update ms2 to clean up ffmpeg dependencies 2011-11-28 12:31:12 +01:00
Guillaume Beraudo
8c2d49fae3 Update dependencies. 2011-11-25 12:06:06 +01:00
Guillaume Beraudo
bb2582f220 Set current call = null earlier when pausing. 2011-11-24 16:24:56 +01:00
Guillaume Beraudo
e261dcc207 Merge branch 'master' of git.linphone.org:linphone-android
Conflicts:
	src/org/linphone/IncallActivity.java
	src/org/linphone/LinphoneActivity.java
	src/org/linphone/LinphonePreferencesActivity.java
	submodules/linphone
	test/org/linphone/TestConferenceActivity.java
2011-11-24 11:22:07 +01:00
Simon Morlat
cc90b960f1 media encryption API enhancements
add preference for media encryption selection.
2011-11-23 22:20:00 +01:00
Simon Morlat
72a5086327 Merge branch 'master' of git://git.linphone.org/linphone 2011-11-23 22:19:05 +01:00
Simon Morlat
ad0cc88a91 java API enhancements for media encryption 2011-11-23 22:15:13 +01:00
Jehan Monnier
53b732a7d3 update ms2 with a fix for IOS 2011-11-23 15:00:07 +01:00
Simon Morlat
4fae808fe8 Merge branch 'master' of git.linphone.org:linphone 2011-11-22 12:25:47 +01:00
Simon Morlat
08f3887acc add a quit menu for whose who don't have a systray 2011-11-22 12:25:01 +01:00
Guillaume Beraudo
34a0b4eb5e Fundamental incall UI changes.
- single click for resuming/pausing call;
- long click for advanced call/conference interaction;
- terminate call action according to situation;
- conference details activity;
- cleanings.
2011-11-22 11:21:36 +01:00
Guillaume Beraudo
ab498e8e8c Fix call not paused when entering conference. 2011-11-22 11:09:33 +01:00
Simon Morlat
7c514d326b fixes for sRTP support 2011-11-21 22:25:23 +01:00
Simon Morlat
0d04b9451b add new warnings. 2011-11-21 14:58:40 +01:00
Simon Morlat
83788d209f Merge branch 'master' of git://git.linphone.org/linphone 2011-11-21 14:58:29 +01:00
Jehan Monnier
63d70bc59f update doxygen for linphoen 1.1 for IOS 2011-11-21 12:52:11 +01:00
Simon Morlat
f96adbebb7 add -lresolv for eXosip on ios 2011-11-21 12:41:14 +01:00
Jehan Monnier
5117bc1439 update ms2 to fix IOS rotation bug 2011-11-18 14:36:53 +01:00
Guillaume Beraudo
50d7841129 Remove useless zid param. 2011-11-18 10:00:38 +01:00
Guillaume Beraudo
6f1dffe83a Zrtp reset verified command. 2011-11-18 09:55:56 +01:00
Simon Morlat
0f43641430 remove unused qvga-portrait and qcif-portrait and update ms2 for important fixes for video on linux 2011-11-17 23:53:59 +01:00
Simon Morlat
3aebf91715 update ms2 for alsa bug 2011-11-17 12:17:51 +01:00
Jehan Monnier
46be0d8464 move vp8 mime type from: VP8-DRAFT-0-3-2 to VP8 2011-11-17 10:52:17 +01:00
Jehan Monnier
61cab5f7bb update ms2 fix compilation issue on resampler 2011-11-16 14:48:12 +01:00
Jehan Monnier
54b07011d5 update ms2 to fix compilation issue on resampler 2011-11-16 14:42:32 +01:00
Jehan Monnier
ec7b4c95b3 update ms2 and oRTP to enable makefile dependency generation on MACOSX 2011-11-16 14:25:58 +01:00
Pierre-Eric Pelloux-Prayer
9d5c704634 New ms2 2011-11-16 11:07:51 +01:00
Pierre-Eric Pelloux-Prayer
07b0535c9b Update ms2 2011-11-16 10:50:34 +01:00
Guillaume Beraudo
b15cee59b3 Improve ZRTP GUI + setAuthenticationVerified 2011-11-14 22:22:48 +01:00
Guillaume Beraudo
ce510f9d1f Jni for setAuthenticationTokenVerified function. 2011-11-14 15:32:31 +01:00
Simon Morlat
1df8bd8d0e update ms2 2011-11-14 13:53:54 +01:00
Simon Morlat
40fd07b9b3 fix potential crash at end of conference 2011-11-14 13:50:17 +01:00
Jehan Monnier
f73c27ab0f Merge branch 'master' of git.linphone.org:linphone 2011-11-14 11:53:02 +01:00
Jehan Monnier
1430a14970 update ms2 2011-11-14 11:51:38 +01:00
Simon Morlat
43e8b0bbef read conference sample rate from config file 2011-11-14 11:31:11 +01:00
Jehan Monnier
e6c0ee2f7c Merge remote-tracking branch 'private/dev_videoios'
Conflicts:
	mediastreamer2
2011-11-14 11:10:24 +01:00
Simon Morlat
c5b5ad0836 update ms2 for android fix 2011-11-10 23:27:33 +01:00
Simon Morlat
154a1e4f1e update ms2 2011-11-10 18:54:55 +01:00
Sylvain Berfini
ffabdf367a Patched POTFILES.in 2011-11-10 16:41:17 +01:00
Sylvain Berfini
80b16add4c Patched cs.po 2011-11-10 16:29:12 +01:00
Simon Morlat
453e6a5319 add option to enable echo limiter, and fallback to it when echo limiter failed 2011-11-09 17:28:51 +01:00