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

bugfixes in pause/resume

Browse source
This commit is contained in:
Simon Morlat 2011-02-03 12:54:42 +01:00
parent 8647ec6aa0
commit 53859fc1ea
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
coreapi/callbacks.c
View file

@ -362,6 +362,7 @@ static void call_updating(SalOp *op){
if (md && !sal_media_description_empty(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)){
/* we are being paused */
if(lc->vtable.display_status)

15
coreapi/offeranswer.c
View file

@ -133,19 +133,16 @@ static SalStreamDir compute_dir_incoming(SalStreamDir local, SalStreamDir offere
res=SalStreamSendOnly;
if (offered==SalStreamInactive)
res=SalStreamInactive;
else
res=SalStreamSendRecv;
}else if (local==SalStreamSendOnly){
if (offered==SalStreamSendOnly)
res=SalStreamInactive;
if (offered==SalStreamRecvOnly)
res=SalStreamSendOnly;
if (offered==SalStreamInactive)
res=SalStreamInactive;
else res=SalStreamInactive;
}else if (local==SalStreamRecvOnly){
if (offered==SalStreamSendOnly)
if (offered==SalStreamSendOnly || offered==SalStreamSendRecv)
res=SalStreamRecvOnly;
if (offered==SalStreamRecvOnly)
res=SalStreamInactive;
if (offered==SalStreamInactive)
else
res=SalStreamInactive;
}else res=SalStreamInactive;
return res;
@ -177,7 +174,7 @@ static void initiate_incoming(const SalStreamDescription *local_cap,
result->payloads=match_payloads(local_cap->payloads,remote_offer->payloads, FALSE, one_matching_codec);
result->proto=local_cap->proto;
result->type=local_cap->type;
result->dir=compute_dir_incoming(result->dir,remote_offer->dir);
result->dir=compute_dir_incoming(local_cap->dir,remote_offer->dir);
if (result->payloads && !only_telephone_event(result->payloads)){
strcpy(result->addr,local_cap->addr);
result->port=local_cap->port;