mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-24 14:48:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Call new mediastreamer2 stream type API to fix ringing from linphone in wrong stream on Android

Browse source
This commit is contained in:
Sylvain Berfini 2017-11-21 10:52:13 +01:00
parent bb5b22b932
commit d2a7cfafb3
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
coreapi/linphonecore.c
View file

@ -3697,6 +3697,7 @@ void linphone_core_notify_incoming_call(LinphoneCore *lc, LinphoneCall *call){
if (lc->ringstream && lc->dmfs_playing_start_time!=0){
linphone_core_stop_dtmf_stream(lc);
}
ms_snd_card_set_stream_type(ringcard, MS_SND_CARD_STREAM_RING);
linphone_ringtoneplayer_start(lc->factory, lc->ringtoneplayer, ringcard, lc->sound_conf.local_ring, 2000);
}else{
/* else play a tone within the context of the current call */

5
src/conference/session/media-session.cpp
View file

@ -2584,6 +2584,11 @@ void MediaSessionPrivate::startAudioStream (LinphoneCallState targetState, bool
captcard = playcard = nullptr;
}
#endif
if (playcard) {
ms_snd_card_set_stream_type(playcard, MS_SND_CARD_STREAM_VOICE);
}
bool useEc = captcard && linphone_core_echo_cancellation_enabled(core);
audio_stream_enable_echo_canceller(audioStream, useEc);
if (playcard && (stream->max_rate > 0))