Changeset 3313 for pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c

Timestamp:

Sep 20, 2010 6:13:02 AM (14 years ago)

Author:

nanang

Message:

Closed #1129:

• Added run-time configuration for activating/deactivating stream keep-alive (non-codec-VAD mechanism), also added this config to account settings.
• Fixed bug wrong session info pointer "si" in pjsua_media_channel_update() when call audio index is not zero.

File:

• pjproject/trunk/pjsip/src/pjsua-lib/pjsua_media.c (modified) (2 diffs)

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

@@ -1546 +1546 @@
     /* Reset session info with only one media stream */
     sess_info.stream_cnt = 1;
-    if (si != &sess_info.stream_info[0])
+    if (si != &sess_info.stream_info[0]) {
         pj_memcpy(&sess_info.stream_info[0], si, sizeof(pjmedia_stream_info));
+        si = &sess_info.stream_info[0];
+    }
 
     /* Check if no media is active */
@@ -1638 +1640 @@
         si->rtp_seq = call->rtp_tx_seq;
         si->rtp_seq_ts_set = call->rtp_tx_seq_ts_set;
+
+#if defined(PJMEDIA_STREAM_ENABLE_KA) && PJMEDIA_STREAM_ENABLE_KA!=0
+        /* Enable/disable stream keep-alive and NAT hole punch. */
+        si->use_ka = pjsua_var.acc[call->acc_id].cfg.use_stream_ka;
+#endif
 
         /* Create session based on session info. */