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

fix bugs

Browse source
This commit is contained in:
Simon Morlat 2010-08-17 16:16:58 +02:00
parent c18cff36d5
commit 7a02fb5ab1
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
coreapi/callbacks.c
View file

@ -189,6 +189,11 @@ static void call_accepted(SalOp *op){
sal_media_description_ref(call->resultdesc);
call->media_pending=FALSE;
}
if (call->state==LinphoneCallOutgoingProgress ||
call->state==LinphoneCallOutgoingRinging ||
call->state==LinphoneCallOutgoingEarlyMedia){
linphone_call_set_state(call,LinphoneCallConnected,"Connected");
}
if (call->resultdesc && !sal_media_description_empty(call->resultdesc)){
if (sal_media_description_has_dir(call->resultdesc,SalStreamSendOnly)){
/*we initiated a pause*/
@ -200,14 +205,14 @@ static void call_accepted(SalOp *op){
ms_free(msg);
}
linphone_call_set_state(call,LinphoneCallPaused,"Call paused");
linphone_call_start_media_streams (call);
}else{
linphone_connect_incoming(lc,call);
}
linphone_call_set_state(call,LinphoneCallStreamsRunning,"Connected (streams running)");
}
linphone_call_start_media_streams (call);
}else{
/*send a bye*/
ms_error("Incompatible SDP offer received in 200Ok, need to abort the call");
linphone_core_terminate_call(lc,NULL);
linphone_core_abort_call(lc,call,"No codec intersection");
}
}

1
coreapi/linphonecore.c
View file

@ -2145,6 +2145,7 @@ int linphone_core_accept_call(LinphoneCore *lc, LinphoneCall *call)
call->resultdesc=sal_call_get_final_media_description(call->op);
if (call->resultdesc){
linphone_call_start_media_streams(call);
linphone_call_set_state(call,LinphoneCallStreamsRunning,"Connected (streams running)");
sal_media_description_ref(call->resultdesc);
}else call->media_pending=TRUE;
ms_message("call answered.");

2
oRTP

@ -1 +1 @@
Subproject commit 534074027a2163694ce6f8a520f0d6f6ac82b15d
Subproject commit a084620745b1b1c81ec93501ffbb3de373f7c8c9