Changeset 4929 for pjproject

Timestamp:

Sep 24, 2014 8:26:33 AM (10 years ago)

Author:

nanang

Message:

Close #1793: Avoid call setting flags PJSUA_CALL_UNHOLD, PJSUA_CALL_UPDATE_CONTACT, and PJSUA_CALL_NO_SDP_OFFER to be sticky or reused in the next calls of pjsua_call_reinvite/update().

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (8 diffs)
• src/pjsua-lib/pjsua_call.c (modified) (8 diffs)

pjproject/trunk/pjsip/include/pjsua-lib/pjsua.h

@@ -613 +613 @@
      * Bitmask of #pjsua_call_flag constants.
      *
-     * Default: 0
+     * Default: PJSUA_CALL_INCLUDE_DISABLED_MEDIA
      */
     unsigned         flag;
@@ -620 +620 @@
      * This flag controls what methods to request keyframe are allowed on
      * the call. Value is bitmask of #pjsua_vid_req_keyframe_method.
+     *
+     * Default: PJSUA_VID_REQ_KEYFRAME_SIP_INFO
      */
     unsigned         req_keyframe_method;
@@ -4086 +4088 @@
     /**
      * When the call is being put on hold, specify this flag to unhold it.
-     * This flag is only valid for #pjsua_call_reinvite(). Note: for
-     * compatibility reason, this flag must have value of 1 because
-     * previously the unhold option is specified as boolean value.
+     * This flag is only valid for #pjsua_call_reinvite() and
+     * #pjsua_call_update(). Note: for compatibility reason, this flag must
+     * have value of 1 because previously the unhold option is specified as
+     * boolean value.
      */
     PJSUA_CALL_UNHOLD = 1,
@@ -4106 +4109 @@
      * Include SDP "m=" line with port set to zero for each disabled media
      * (i.e when aud_cnt or vid_cnt is set to zero). This flag is only valid
-     * for #pjsua_call_make_call().
+     * for #pjsua_call_make_call(), #pjsua_call_reinvite(), and
+     * #pjsua_call_update(). Note that even this flag is applicable in
+     * #pjsua_call_reinvite() and #pjsua_call_update(), it will only take
+     * effect when the re-INVITE/UPDATE operation regenerates SDP offer,
+     * such as changing audio or video count in the call setting.
      */
     PJSUA_CALL_INCLUDE_DISABLED_MEDIA = 4,
@@ -4591 +4598 @@
 
 /**
- * Send re-INVITE to release hold.
+ * Send re-INVITE request or release hold.
  * The final status of the request itself will be reported on the
  * \a on_call_media_state() callback, which inform the application that
@@ -4611 +4618 @@
 
 /**
- * Send re-INVITE to release hold.
+ * Send re-INVITE request or release hold.
  * The final status of the request itself will be reported on the
  * \a on_call_media_state() callback, which inform the application that
@@ -4618 +4625 @@
  * @param call_id       Call identification.
  * @param opt           Optional call setting, if NULL, the current call
- *                      setting will remain unchanged.
+ *                      setting will be used. Note that to release hold
+ *                      or update contact or omit SDP offer, this parameter
+ *                      cannot be NULL and it must specify appropriate flags,
+ *                      e.g: PJSUA_CALL_UNHOLD, PJSUA_CALL_UPDATE_CONTACT,
+ *                      PJSUA_CALL_NO_SDP_OFFER.
  * @param msg_data      Optional message components to be sent with
  *                      the request.
@@ -4649 +4660 @@
  * @param call_id       Call identification.
  * @param opt           Optional call setting, if NULL, the current call
- *                      setting will remain unchanged.
+ *                      setting will be used. Note that to release hold
+ *                      or update contact or omit SDP offer, this parameter
+ *                      cannot be NULL and it must specify appropriate flags,
+ *                      e.g: PJSUA_CALL_UNHOLD, PJSUA_CALL_UPDATE_CONTACT,
+ *                      PJSUA_CALL_NO_SDP_OFFER.
  * @param msg_data      Optional message components to be sent with
  *                      the request.

pjproject/trunk/pjsip/src/pjsua-lib/pjsua_call.c

@@ -557 +557 @@
 
 /*
+ * Cleanup call setting flag to avoid one time flags, such as
+ * PJSUA_CALL_UNHOLD, PJSUA_CALL_UPDATE_CONTACT, or
+ * PJSUA_CALL_NO_SDP_OFFER, to be sticky (ticket #1793).
+ */
+static void cleanup_call_setting_flag(pjsua_call_setting *opt)
+{
+    opt->flag &= ~(PJSUA_CALL_UNHOLD | PJSUA_CALL_UPDATE_CONTACT |
+                   PJSUA_CALL_NO_SDP_OFFER);
+}
+
+
+/*
  * Initialize call settings based on account ID.
  */
@@ -580 +592 @@
     pj_assert(call);
 
-    if (!opt)
+    if (!opt) {
+        cleanup_call_setting_flag(&call->opt);
         return PJ_SUCCESS;
+    }
 
 #if !PJMEDIA_HAS_VIDEO
@@ -1146 +1160 @@
         /* Copy call setting from the replaced call */
         call->opt = replaced_call->opt;
+        cleanup_call_setting_flag(&call->opt);
 
         /* Notify application */
@@ -2411 +2426 @@
         call->opt.flag = options;
 
-    status = pjsua_call_reinvite2(call_id, NULL, msg_data);
+    status = pjsua_call_reinvite2(call_id, &call->opt, msg_data);
 
 on_return:
@@ -2525 +2540 @@
         call->opt.flag = options;
 
-    status = pjsua_call_update2(call_id, NULL, msg_data);
+    status = pjsua_call_update2(call_id, &call->opt, msg_data);
 
 on_return:
@@ -3952 +3967 @@
     if (pjsua_var.ua_cfg.cb.on_call_rx_offer) {
         pjsip_status_code code = PJSIP_SC_OK;
-        pjsua_call_setting opt = call->opt;
+        pjsua_call_setting opt;
+
+        cleanup_call_setting_flag(&call->opt);
+        opt = call->opt;
 
         (*pjsua_var.ua_cfg.cb.on_call_rx_offer)(call->index, offer, NULL,
@@ -4374 +4392 @@
     }
 
+    cleanup_call_setting_flag(&existing_call->opt);
     call_opt = existing_call->opt;
     if (pjsua_var.ua_cfg.cb.on_call_transfer_request2) {
@@ -4677 +4696 @@
         {
             /* Call unhold failed */
-            call->opt.flag &= ~PJSUA_CALL_UNHOLD;
             call->local_hold = PJ_TRUE;
             PJ_LOG(3,(THIS_FILE, "Error releasing hold on call %d (reason=%d)",