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

fix bugs with local conferencing implementation:

Browse source 
- the local participant was not added when the conference is started from scratch
- the conference reINVITE was accidentally turning off implicit avpf.
This commit is contained in:
Simon Morlat 2017-06-02 16:56:48 +02:00
parent 9296483873
commit 4fccaf7b8f
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
coreapi/conference.cc
View file

@ -394,6 +394,7 @@ void LocalConference::addLocalEndpoint() {
_post_configure_audio_stream(st,m_core,FALSE);
m_localParticipantStream=st;
m_localEndpoint=ms_audio_endpoint_get_from_stream(st,FALSE);
ms_message("conference: adding local endpoint");
ms_audio_conference_add_member(m_conf,m_localEndpoint);
}
@ -418,6 +419,8 @@ int LocalConference::inviteAddresses(const std::list<const LinphoneAddress*> &ad
if (!call->current_params->in_conference)
addParticipant(call);
}
/*if the local participant is not yet created, created it and it to the conference */
if (!m_localEndpoint) addLocalEndpoint();
}
return 0;
}
@ -433,7 +436,7 @@ int LocalConference::addParticipant(LinphoneCall *call) {
call->params->has_video=FALSE;
linphone_call_resume(call);
}else if (call->state==LinphoneCallStreamsRunning){
LinphoneCallParams *params=linphone_call_params_copy(linphone_call_get_current_params(call));
LinphoneCallParams *params = linphone_core_create_call_params(m_core, call);
params->in_conference=TRUE;
params->has_video=FALSE;