Changeset 4204 for pjproject/trunk

Timestamp:

Jul 13, 2012 7:38:06 AM (12 years ago)

Author:

bennylp

Message:

Fixed #1553: Account setting to disable re-INVITE or UPDATE to lock codec

Location:

pjproject/trunk/pjsip

Files:

• include/pjsua-lib/pjsua.h (modified) (1 diff)
• src/pjsua-lib/pjsua_call.c (modified) (1 diff)
• src/pjsua-lib/pjsua_core.c (modified) (1 diff)

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

@@ -2744 +2744 @@
     pj_str_t        proxy[PJSUA_ACC_MAX_PROXIES];
 
+    /**
+     * If remote sends SDP answer containing more than one format or codec in
+     * the media line, send re-INVITE or UPDATE with just one codec to lock
+     * which codec to use.
+     *
+     * Default: 1 (Yes). Set to zero to disable.
+     */
+    unsigned        lock_codec;
+
     /** 
      * Optional interval for registration, in seconds. If the value is zero, 

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

@@ -3060 +3060 @@
     pj_bool_t has_mult_fmt = PJ_FALSE;
     pj_status_t status;
+
+    if (!pjsua_var.acc[call->acc_id].cfg.lock_codec) {
+        return PJ_SUCCESS;
+    }
 
     /* Stop lock codec timer, if it is active */

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

@@ -216 +216 @@
     cfg->use_timer = pjsua_var.ua_cfg.use_timer;
     cfg->timer_setting = pjsua_var.ua_cfg.timer_setting;
+    cfg->lock_codec = 1;
     cfg->ka_interval = 15;
     cfg->ka_data = pj_str("\r\n");