From aba3dac9349179df54021b73f10b774d0cf28bed Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 14 Feb 2012 19:19:59 +0100 Subject: [PATCH] implement new apis to control video enablement during calls. --- coreapi/callbacks.c | 82 +++++++++++++++++++++++----------------- coreapi/linphonecall.c | 60 ++++++++++++++++++++++++----- coreapi/linphonecore.c | 85 +++++++++++++++++++++++++++++++++++++----- coreapi/linphonecore.h | 7 ++++ coreapi/private.h | 9 ++++- coreapi/sal.h | 1 + coreapi/sal_eXosip2.c | 52 ++++++++++++++++++-------- coreapi/sal_eXosip2.h | 2 +- 8 files changed, 226 insertions(+), 72 deletions(-) diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c index a2dfffee..d9296b36 100644 --- a/coreapi/callbacks.c +++ b/coreapi/callbacks.c @@ -404,50 +404,62 @@ static void call_ack(SalOp *op){ } } +static void call_accept_update(LinphoneCore *lc, LinphoneCall *call){ + SalMediaDescription *md; + sal_call_accept(call->op); + md=sal_call_get_final_media_description(call->op); + if (md && !sal_media_description_empty(md)) + linphone_core_update_streams(lc,call,md); +} + +static void call_resumed(LinphoneCore *lc, LinphoneCall *call){ + call_accept_update(lc,call); + if(lc->vtable.display_status) + lc->vtable.display_status(lc,_("We have been resumed.")); + linphone_call_set_state(call,LinphoneCallStreamsRunning,"Connected (streams running)"); +} + +static void call_paused_by_remote(LinphoneCore *lc, LinphoneCall *call){ + call_accept_update(lc,call); + /* we are being paused */ + if(lc->vtable.display_status) + lc->vtable.display_status(lc,_("We are paused by other party.")); + linphone_call_set_state (call,LinphoneCallPausedByRemote,"Call paused by remote"); +} + +static void call_updated_by_remote(LinphoneCore *lc, LinphoneCall *call){ + if(lc->vtable.display_status) + lc->vtable.display_status(lc,_("Call is updated by remote.")); + call->defer_update=FALSE; + linphone_call_set_state(call, LinphoneCallUpdatedByRemote,"Call updated by remote"); + if (call->defer_update==FALSE){ + linphone_core_accept_call_update(lc,call,NULL); + } +} /* this callback is called when an incoming re-INVITE modifies the session*/ static void call_updating(SalOp *op){ LinphoneCore *lc=(LinphoneCore *)sal_get_user_pointer(sal_op_get_sal(op)); LinphoneCall *call=(LinphoneCall*)sal_op_get_user_pointer(op); - LinphoneCallState prevstate=LinphoneCallIdle; - SalMediaDescription *md; - SalMediaDescription *old_md=call->resultdesc; + SalMediaDescription *rmd=sal_call_get_remote_media_description(op); - sal_media_description_ref(old_md); - - md=sal_call_get_final_media_description(op); - - /*accept the modification (sends a 200Ok)*/ - sal_call_accept(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)){ - /* we are being paused */ - if(lc->vtable.display_status) - lc->vtable.display_status(lc,_("We are being paused...")); - linphone_call_set_state (call,LinphoneCallPausedByRemote,"Call paused by remote"); - }else if (!sal_media_description_has_dir(old_md,SalStreamSendRecv) && sal_media_description_has_dir(md,SalStreamSendRecv)){ - if(lc->vtable.display_status) - lc->vtable.display_status(lc,_("We have been resumed...")); - linphone_call_set_state (call,LinphoneCallStreamsRunning,"Connected (streams running)"); + switch(call->state){ + case LinphoneCallPausedByRemote: + if (sal_media_description_has_dir(rmd,SalStreamSendRecv) || sal_media_description_has_dir(rmd,SalStreamRecvOnly)){ + call_resumed(lc,call); + } + break; + case LinphoneCallStreamsRunning: + case LinphoneCallConnected: + if (sal_media_description_has_dir(rmd,SalStreamSendOnly) || sal_media_description_has_dir(rmd,SalStreamInactive)){ + call_paused_by_remote(lc,call); }else{ - prevstate=call->state; - if(lc->vtable.display_status) - lc->vtable.display_status(lc,_("Call has been updated by remote...")); - linphone_call_set_state(call, LinphoneCallUpdatedByRemote,"Call updated by remote"); + call_updated_by_remote(lc,call); } - } - - if (prevstate!=LinphoneCallIdle){ - linphone_call_set_state (call,prevstate,"Connected (streams running)"); - } + break; + default: + call_accept_update(lc,call); } - sal_media_description_unref(old_md); } static void call_terminated(SalOp *op, const char *from){ diff --git a/coreapi/linphonecall.c b/coreapi/linphonecall.c index 31c9cbfc..888c7659 100644 --- a/coreapi/linphonecall.c +++ b/coreapi/linphonecall.c @@ -246,14 +246,13 @@ static SalMediaDescription *_create_local_media_description(LinphoneCore *lc, Li return md; } -void update_local_media_description(LinphoneCore *lc, LinphoneCall *call, SalMediaDescription **md){ - if (*md == NULL) { - *md = _create_local_media_description(lc,call,0,0); +void update_local_media_description(LinphoneCore *lc, LinphoneCall *call){ + SalMediaDescription *md=call->localdesc; + if (md== NULL) { + call->localdesc = create_local_media_description(lc,call); } else { - unsigned int id = (*md)->session_id; - unsigned int ver = (*md)->session_ver+1; - sal_media_description_unref(*md); - *md = _create_local_media_description(lc,call,id,ver); + call->localdesc = _create_local_media_description(lc,call,md->session_id,md->session_ver+1); + sal_media_description_unref(md); } } @@ -402,6 +401,11 @@ static void linphone_call_set_terminated(LinphoneCall *call){ } } +void linphone_call_fix_call_parameters(LinphoneCall *call){ + call->params.has_video=call->current_params.has_video; + call->params.media_encryption=call->current_params.media_encryption; +} + const char *linphone_call_state_to_string(LinphoneCallState cs){ switch (cs){ case LinphoneCallIdle: @@ -553,6 +557,41 @@ const LinphoneCallParams * linphone_call_get_current_params(const LinphoneCall * return &call->current_params; } +static bool_t is_video_active(const SalStreamDescription *sd){ + return sd->port!=0 && sd->dir!=SalStreamInactive; +} + +/** + * Returns call parameters proposed by remote. + * + * This is useful when receiving an incoming call, to know whether the remote party + * supports video, encryption or whatever. +**/ +const LinphoneCallParams * linphone_call_get_remote_params(LinphoneCall *call){ + LinphoneCallParams *cp=&call->remote_params; + memset(cp,0,sizeof(*cp)); + if (call->op){ + SalMediaDescription *md=sal_call_get_remote_media_description(call->op); + if (md){ + SalStreamDescription *asd,*vsd,*secure_asd,*secure_vsd; + + asd=sal_media_description_find_stream(md,SalProtoRtpAvp,SalAudio); + vsd=sal_media_description_find_stream(md,SalProtoRtpAvp,SalVideo); + secure_asd=sal_media_description_find_stream(md,SalProtoRtpSavp,SalAudio); + secure_vsd=sal_media_description_find_stream(md,SalProtoRtpSavp,SalVideo); + if (secure_vsd){ + cp->has_video=is_video_active(secure_vsd); + if (secure_asd || asd==NULL) + cp->media_encryption=LinphoneMediaEncryptionSRTP; + }else if (vsd){ + cp->has_video=is_video_active(vsd); + } + return cp; + } + } + return NULL; +} + /** * Returns the remote address associated to this call * @@ -1293,11 +1332,12 @@ void linphone_call_start_media_streams(LinphoneCall *call, bool_t all_inputs_mut }else if (call->params.media_encryption==LinphoneMediaEncryptionSRTP){ call->current_params.media_encryption=linphone_call_are_all_streams_encrypted(call) ? LinphoneMediaEncryptionSRTP : LinphoneMediaEncryptionNone; - /*also reflect the change if the "wished" params, in order to avoid to propose SAVP again - * further in the call, for example during pause,resume, conferencing reINVITEs*/ - call->params.media_encryption=call->current_params.media_encryption; } + /*also reflect the change if the "wished" params, in order to avoid to propose SAVP or video again + * further in the call, for example during pause,resume, conferencing reINVITEs*/ + linphone_call_fix_call_parameters(call); + goto end; end: ms_free(cname); diff --git a/coreapi/linphonecore.c b/coreapi/linphonecore.c index 3fddf65f..68cea9b3 100644 --- a/coreapi/linphonecore.c +++ b/coreapi/linphonecore.c @@ -2285,9 +2285,8 @@ int linphone_core_update_call(LinphoneCore *lc, LinphoneCall *call, const Linpho if (params!=NULL){ const char *subject; call->params=*params; - update_local_media_description(lc,call,&call->localdesc); - call->camera_active=params->has_video; - + update_local_media_description(lc,call); + if (params->in_conference){ subject="Conference"; }else{ @@ -2311,6 +2310,50 @@ int linphone_core_update_call(LinphoneCore *lc, LinphoneCall *call, const Linpho return err; } +/** + * When receiving a LinphoneCallUpdatedByRemote state notification, prevent LinphoneCore from performing an automatic answer. + * + * When receiving a LinphoneCallUpdatedByRemote state notification (ie an incoming reINVITE), the default behaviour of + * LinphoneCore is to automatically answer the reINIVTE with call parameters unchanged. + * However when for example when the remote party updated the call to propose a video stream, it can be useful + * to prompt the user before answering. This can be achieved by calling linphone_core_defer_call_update() during + * the call state notifiacation, to deactivate the automatic answer that would just confirm the audio but reject the video. + * Then, when the user responds to dialog prompt, it becomes possible to call linphone_core_accept_call_update() to answer + * the reINVITE, with eventually video enabled in the LinphoneCallParams argument. + * + * @Returns 0 if successful, -1 if the linphone_core_defer_call_update() was done outside a LinphoneCallUpdatedByRemote notification, which is illegal. +**/ +int linphone_core_defer_call_update(LinphoneCore *lc, LinphoneCall *call){ + if (call->state==LinphoneCallUpdatedByRemote){ + call->defer_update=TRUE; + return 0; + } + ms_error("linphone_core_defer_call_update() not done in state LinphoneCallUpdatedByRemote"); + return -1; +} + +/** + * +**/ +int linphone_core_accept_call_update(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallParams *params){ + SalMediaDescription *md; + if (call->state!=LinphoneCallUpdatedByRemote){ + ms_error("linphone_core_accept_update(): invalid state %s to call this function.", + linphone_call_state_to_string(call->state)); + return -1; + } + if (params){ + call->params=*params; + update_local_media_description(lc,call); + sal_call_set_local_media_description(call->op,call->localdesc); + } + sal_call_accept(call->op); + md=sal_call_get_final_media_description(call->op); + if (md && !sal_media_description_empty(md)) + linphone_core_update_streams (lc,call,md); + linphone_call_set_state(call,LinphoneCallStreamsRunning,"Connected (streams running)"); + return 0; +} /** * Accept an incoming call. @@ -2325,7 +2368,25 @@ int linphone_core_update_call(LinphoneCore *lc, LinphoneCall *call, const Linpho * @param call the LinphoneCall object representing the call to be answered. * **/ -int linphone_core_accept_call(LinphoneCore *lc, LinphoneCall *call) +int linphone_core_accept_call(LinphoneCore *lc, LinphoneCall *call){ + return linphone_core_accept_call_with_params(lc,call,NULL); +} + +/** + * Accept an incoming call, with parameters. + * + * @ingroup call_control + * Basically the application is notified of incoming calls within the + * call_state_changed callback of the #LinphoneCoreVTable structure, where it will receive + * a LinphoneCallIncoming event with the associated LinphoneCall object. + * The application can later accept the call using + * this method. + * @param lc the LinphoneCore object + * @param call the LinphoneCall object representing the call to be answered. + * @param params the specific parameters for this call, for example whether video is accepted or not. Use NULL to use default parameters. + * +**/ +int linphone_core_accept_call_with_params(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallParams *params) { LinphoneProxyConfig *cfg=NULL,*dest_proxy=NULL; const char *contact=NULL; @@ -2388,6 +2449,12 @@ int linphone_core_accept_call(LinphoneCore *lc, LinphoneCall *call) if (call->audiostream==NULL) linphone_call_init_media_streams(call); + if (params){ + call->params=*params; + update_local_media_description(lc,call); + sal_call_set_local_media_description(call->op,call->localdesc); + } + sal_call_accept(call->op); if (lc->vtable.display_status!=NULL) lc->vtable.display_status(lc,_("Connected.")); @@ -2540,7 +2607,7 @@ int linphone_core_pause_call(LinphoneCore *lc, LinphoneCall *call) ms_warning("Cannot pause this call, it is not active."); return -1; } - update_local_media_description(lc,call,&call->localdesc); + update_local_media_description(lc,call); if (sal_media_description_has_dir(call->resultdesc,SalStreamSendRecv)){ sal_media_description_set_dir(call->localdesc,SalStreamSendOnly); subject="Call on hold"; @@ -2613,11 +2680,11 @@ int linphone_core_resume_call(LinphoneCore *lc, LinphoneCall *the_call) ms_message("Resuming call %p",call); } - // Stop playing music immediately. If remote side is a conference it - // prevents the participants to hear it while the 200OK comes back. - audio_stream_play(call->audiostream, NULL); + /* Stop playing music immediately. If remote side is a conference it + prevents the participants to hear it while the 200OK comes back.*/ + if (call->audiostream) audio_stream_play(call->audiostream, NULL); - update_local_media_description(lc,the_call,&call->localdesc); + update_local_media_description(lc,the_call); sal_call_set_local_media_description(call->op,call->localdesc); sal_media_description_set_dir(call->localdesc,SalStreamSendRecv); if (call->params.in_conference && !call->current_params.in_conference) subject="Conference"; diff --git a/coreapi/linphonecore.h b/coreapi/linphonecore.h index 83edb497..4a6fed8b 100644 --- a/coreapi/linphonecore.h +++ b/coreapi/linphonecore.h @@ -259,6 +259,7 @@ bool_t linphone_call_has_transfer_pending(const LinphoneCall *call); LinphoneCall *linphone_call_get_replaced_call(LinphoneCall *call); int linphone_call_get_duration(const LinphoneCall *call); const LinphoneCallParams * linphone_call_get_current_params(const LinphoneCall *call); +const LinphoneCallParams * linphone_call_get_remote_params(LinphoneCall *call); void linphone_call_enable_camera(LinphoneCall *lc, bool_t enabled); bool_t linphone_call_camera_enabled(const LinphoneCall *lc); int linphone_call_take_video_snapshot(LinphoneCall *call, const char *file); @@ -690,6 +691,8 @@ LinphoneCall *linphone_core_get_current_call(const LinphoneCore *lc); int linphone_core_accept_call(LinphoneCore *lc, LinphoneCall *call); +int linphone_core_accept_call_with_params(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallParams *params); + int linphone_core_terminate_call(LinphoneCore *lc, LinphoneCall *call); int linphone_core_redirect_call(LinphoneCore *lc, LinphoneCall *call, const char *redirect_uri); @@ -704,6 +707,10 @@ int linphone_core_resume_call(LinphoneCore *lc, LinphoneCall *call); int linphone_core_update_call(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallParams *params); +int linphone_core_defer_call_update(LinphoneCore *lc, LinphoneCall *call); + +int linphone_core_accept_call_update(LinphoneCore *lc, LinphoneCall *call, const LinphoneCallParams *params); + LinphoneCallParams *linphone_core_create_default_call_parameters(LinphoneCore *lc); LinphoneCall *linphone_core_get_call_by_remote_address(LinphoneCore *lc, const char *remote_address); diff --git a/coreapi/private.h b/coreapi/private.h index 2baa40a9..ccb1b1b7 100644 --- a/coreapi/private.h +++ b/coreapi/private.h @@ -101,6 +101,7 @@ struct _LinphoneCall char *refer_to; LinphoneCallParams params; LinphoneCallParams current_params; + LinphoneCallParams remote_params; int up_bw; /*upload bandwidth setting at the time the call is started. Used to detect if it changes during a call */ int audio_bw; /*upload bandwidth used by audio */ bool_t refer_pending; @@ -117,6 +118,7 @@ struct _LinphoneCall bool_t videostream_encrypted; bool_t audiostream_encrypted; bool_t auth_token_verified; + bool_t defer_update; }; @@ -468,12 +470,15 @@ struct _LinphoneCore bool_t apply_nat_settings; bool_t initial_subscribes_sent; bool_t bl_refresh; + bool_t preview_finished; bool_t auto_net_state_mon; bool_t network_reachable; bool_t use_preview_window; - int device_rotation; + bool_t ringstream_autorelease; + bool_t pad[3]; + int device_rotation; int max_calls; LinphoneTunnel *tunnel; }; @@ -492,7 +497,7 @@ int linphone_core_get_calls_nb(const LinphoneCore *lc); void linphone_core_set_state(LinphoneCore *lc, LinphoneGlobalState gstate, const char *message); SalMediaDescription *create_local_media_description(LinphoneCore *lc, LinphoneCall *call); -void update_local_media_description(LinphoneCore *lc, LinphoneCall *call, SalMediaDescription **md); +void update_local_media_description(LinphoneCore *lc, LinphoneCall *call); void linphone_core_update_streams(LinphoneCore *lc, LinphoneCall *call, SalMediaDescription *new_md); diff --git a/coreapi/sal.h b/coreapi/sal.h index 0254dfbb..8b0988b0 100644 --- a/coreapi/sal.h +++ b/coreapi/sal.h @@ -324,6 +324,7 @@ int sal_call_notify_ringing(SalOp *h, bool_t early_media); int sal_call_accept(SalOp*h); int sal_call_decline(SalOp *h, SalReason reason, const char *redirection /*optional*/); int sal_call_update(SalOp *h, const char *subject); +SalMediaDescription * sal_call_get_remote_media_description(SalOp *h); SalMediaDescription * sal_call_get_final_media_description(SalOp *h); int sal_call_refer(SalOp *h, const char *refer_to); int sal_call_refer_with_replaces(SalOp *h, SalOp *other_call_h); diff --git a/coreapi/sal_eXosip2.c b/coreapi/sal_eXosip2.c index 1c7fd5b5..c93ce5ad 100644 --- a/coreapi/sal_eXosip2.c +++ b/coreapi/sal_eXosip2.c @@ -508,7 +508,7 @@ static void set_sdp_from_desc(osip_message_t *sip, const SalMediaDescription *de } static void sdp_process(SalOp *h){ - ms_message("Doing SDP offer/answer process"); + ms_message("Doing SDP offer/answer process of type %s",h->sdp_offering ? "outgoing" : "incoming"); if (h->result){ sal_media_description_unref(h->result); } @@ -517,6 +517,9 @@ static void sdp_process(SalOp *h){ offer_answer_initiate_outgoing(h->base.local_media,h->base.remote_media,h->result); }else{ int i; + if (h->sdp_answer){ + sdp_message_free(h->sdp_answer); + } offer_answer_initiate_incoming(h->base.local_media,h->base.remote_media,h->result,h->base.root->one_matching_codec); h->sdp_answer=media_description_to_sdp(h->result); /*once we have generated the SDP answer, we modify the result description for processing by the upper layer. @@ -550,6 +553,15 @@ int sal_call_set_local_media_description(SalOp *h, SalMediaDescription *desc){ if (h->base.local_media) sal_media_description_unref(h->base.local_media); h->base.local_media=desc; + if (h->base.remote_media){ + /*case of an incoming call where we modify the local capabilities between the time + * the call is ringing and it is accepted (for example if you want to accept without video*/ + /*reset the sdp answer so that it is computed again*/ + if (h->sdp_answer){ + sdp_message_free(h->sdp_answer); + h->sdp_answer=NULL; + } + } return 0; } @@ -606,18 +618,19 @@ int sal_call_notify_ringing(SalOp *h, bool_t early_media){ osip_message_t *msg; /*if early media send also 180 and 183 */ - if (early_media && h->sdp_answer){ + if (early_media){ msg=NULL; eXosip_lock(); eXosip_call_build_answer(h->tid,180,&msg); - if (msg){ - set_sdp(msg,h->sdp_answer); - eXosip_call_send_answer(h->tid,180,msg); - } - msg=NULL; + eXosip_call_build_answer(h->tid,183,&msg); if (msg){ - set_sdp(msg,h->sdp_answer); + sdp_process(h); + if (h->sdp_answer){ + set_sdp(msg,h->sdp_answer); + sdp_message_free(h->sdp_answer); + h->sdp_answer=NULL; + } eXosip_call_send_answer(h->tid,183,msg); } eXosip_unlock(); @@ -652,6 +665,7 @@ int sal_call_accept(SalOp * h){ if (h->sdp_offering) { set_sdp_from_desc(msg,h->base.local_media); }else{ + if (h->sdp_answer==NULL) sdp_process(h); if (h->sdp_answer){ set_sdp(msg,h->sdp_answer); sdp_message_free(h->sdp_answer); @@ -697,6 +711,10 @@ int sal_call_decline(SalOp *h, SalReason reason, const char *redirect){ return 0; } +SalMediaDescription * sal_call_get_remote_media_description(SalOp *h){ + return h->base.remote_media; +} + SalMediaDescription * sal_call_get_final_media_description(SalOp *h){ if (h->base.local_media && h->base.remote_media && !h->result){ sdp_process(h); @@ -1032,15 +1050,19 @@ static void handle_ack(Sal *sal, eXosip_event_t *ev){ ms_warning("ack for non-existing call !"); return; } - sdp=eXosip_get_sdp_info(ev->ack); - if (sdp){ - op->base.remote_media=sal_media_description_new(); - sdp_to_media_description(sdp,op->base.remote_media); - sdp_process(op); - sdp_message_free(sdp); + + if (op->sdp_offering){ + sdp=eXosip_get_sdp_info(ev->ack); + if (sdp){ + if (op->base.remote_media) + sal_media_description_unref(op->base.remote_media); + op->base.remote_media=sal_media_description_new(); + sdp_to_media_description(sdp,op->base.remote_media); + sdp_process(op); + sdp_message_free(sdp); + } } if (op->reinvite){ - if (sdp) sal->callbacks.call_updating(op); op->reinvite=FALSE; }else{ sal->callbacks.call_ack(op); diff --git a/coreapi/sal_eXosip2.h b/coreapi/sal_eXosip2.h index f2577ee0..75dd7e58 100644 --- a/coreapi/sal_eXosip2.h +++ b/coreapi/sal_eXosip2.h @@ -65,13 +65,13 @@ struct SalOp{ to retrieve the operation when receiving a response*/ char *replaces; char *referred_by; + const SalAuthInfo *auth_info; bool_t supports_session_timers; bool_t sdp_offering; bool_t reinvite; bool_t masquerade_via; bool_t auto_answer_asked; bool_t terminated; - const SalAuthInfo *auth_info; }; void sal_remove_out_subscribe(Sal *sal, SalOp *op); -- 2.39.2