Changeset 4336 for pjproject/trunk

Timestamp:

Jan 29, 2013 8:15:02 AM (12 years ago)

Author:

ming

Message:

Re #1568: (PJSIP 2.x) Apply pjsua_media_config before detecting media change and fixed encoding name string duplication.

Location:

pjproject/trunk

Files:

• pjmedia/src/pjmedia/stream.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_aud.c (modified) (1 diff)
• pjsip/src/pjsua-lib/pjsua_media.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -2004 +2004 @@
     pj_memcpy(&stream->si, info, sizeof(*info));
     stream->si.param = pjmedia_codec_param_clone(pool, info->param);
+    pj_strdup(pool, &stream->si.fmt.encoding_name, &info->fmt.encoding_name);
 
     /* Init stream/port name */

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

@@ -589 +589 @@
     /* Check if no media is active */
     if (si->dir != PJMEDIA_DIR_NONE) {
-
-        /* 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;
-        }
-
 
         /* Optionally, application may modify other stream settings here

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

@@ -2565 +2565 @@
                              call_id, mi));
                 continue;
+            }
+
+            /* 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;
             }