Changeset 4334

Timestamp:

Jan 25, 2013 6:31:05 AM (12 years ago)

Author:

ming

Message:

Re #1568: Fixed is_media_changed() detection when pjsua_media_cfg.no_vad is set to PJ_TRUE and fixed the string duplication of encoding name
Thanks to Hideo and Fredrik for the reports.

Location:

pjproject/branches/1.x

Files:

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

pjproject/branches/1.x/pjmedia/src/pjmedia/session.c

@@ -672 +672 @@
               si->stream_cnt * sizeof(pjmedia_stream_info));
 
-    /* Clone codec param */
+    /* Clone codec param and format info */
     for (i=0; i<(int)si->stream_cnt; ++i) {
+        pj_strdup(pool, &session->stream_info[i].fmt.encoding_name,
+                  &si->stream_info[i].fmt.encoding_name);
         if (session->stream_info[i].param) {
             session->stream_info[i].param =

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

@@ -1642 +1642 @@
     }
 
-    /* Compare codec param */
+    /* Compare codec param
+     * Disable checking of VAD setting since VAD setting can be overwritten
+     * by application setting in pjsua_media_cfg.
+     */
     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 ||