witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

Fix an issue with video when conferencing

Browse source
This commit is contained in:
Sylvain Berfini 2011-10-20 11:36:57 +02:00
parent f04f19adde
commit 0e4136de34
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
coreapi/callbacks.c
View file

@ -400,6 +400,8 @@ static void call_updating(SalOp *op){
if (md && !sal_media_description_empty(md))
{
linphone_core_update_streams (lc,call,md);
if (sal_media_description_has_dir(call->localdesc,SalStreamSendRecv)){
ms_message("Our local status is SalStreamSendRecv");
if (sal_media_description_has_dir (md,SalStreamRecvOnly) || sal_media_description_has_dir(md,SalStreamInactive)){
@ -420,7 +422,7 @@ static void call_updating(SalOp *op){
}
/*accept the modification (sends a 200Ok)*/
sal_call_accept(op);
linphone_core_update_streams (lc,call,md);
if (prevstate!=LinphoneCallIdle){
linphone_call_set_state (call,prevstate,"Connected (streams running)");
}

2
coreapi/conference.c
View file

@ -61,6 +61,8 @@ void linphone_call_add_to_conf(LinphoneCall *call){
LinphoneCore *lc=call->core;
LinphoneConference *conf=&lc->conf_ctx;
MSAudioEndpoint *ep;
call->params.has_video = FALSE;
call->camera_active = FALSE;
ep=ms_audio_endpoint_get_from_stream(call->audiostream,TRUE);
ms_audio_conference_add_member(conf->conf,ep);
call->endpoint=ep;