Changeset 4337 for pjproject

Timestamp:

Jan 29, 2013 8:24:10 AM (12 years ago)

Author:

ming

Message:

Re #1568: (PJSIP 1.x) Apply pjsua_media_config before detecting media change

File:

• pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_media.c (modified) (3 diffs)

pjproject/branches/1.x/pjsip/src/pjsua-lib/pjsua_media.c

@@ -1647 +1647 @@
      */
     if (old_cp->setting.frm_per_pkt != new_cp->setting.frm_per_pkt ||
-        /* old_cp->setting.vad != new_cp->setting.vad || */
+        old_cp->setting.vad != new_cp->setting.vad ||
         old_cp->setting.cng != new_cp->setting.cng ||
         old_cp->setting.plc != new_cp->setting.plc ||
@@ -1741 +1741 @@
     if (status != PJ_SUCCESS)
         return status;
+
+    /* Override ptime, if this option is specified. */
+    if (pjsua_var.media_cfg.ptime != 0) {
+        si->param->setting.frm_per_pkt = (pj_uint8_t)
+            (pjsua_var.media_cfg.ptime / si->param->info.frm_ptime);
+        if (si->param->setting.frm_per_pkt == 0)
+            si->param->setting.frm_per_pkt = 1;
+    }
+
+    /* Disable VAD, if this option is specified. */
+    if (pjsua_var.media_cfg.no_vad) {
+        si->param->setting.vad = 0;
+    }
 
     /* Get audio index from the negotiated SDP */
@@ -1832 +1845 @@
                 }
             }
-        }
-
-        /* Override ptime, if this option is specified. */
-        if (pjsua_var.media_cfg.ptime != 0) {
-            si->param->setting.frm_per_pkt = (pj_uint8_t)
-                (pjsua_var.media_cfg.ptime / si->param->info.frm_ptime);
-            if (si->param->setting.frm_per_pkt == 0)
-                si->param->setting.frm_per_pkt = 1;
-        }
-
-        /* Disable VAD, if this option is specified. */
-        if (pjsua_var.media_cfg.no_vad) {
-            si->param->setting.vad = 0;
         }