Changeset 1883 for pjproject/trunk

Timestamp:

Mar 21, 2008 8:56:02 AM (17 years ago)

Author:

bennylp

Message:

More ticket #61: bug in pjsua-lib with SRTP. If call is hold and resumed, SRTP transports will use itself as the underlying transport

File:

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

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

@@ -170 +170 @@
      * reference.
      */
-    pjsua_var.mconf_cfg.channel_count = 1;
+    pjsua_var.mconf_cfg.channel_count = pjsua_var.media_cfg.channel_count;
     pjsua_var.mconf_cfg.bits_per_sample = 16;
     pjsua_var.mconf_cfg.samples_per_frame = pjsua_var.media_cfg.clock_rate * 
@@ -786 +786 @@
     pjmedia_transport_media_stop(call->med_tp);
 
+    /* Close upper entry of transport stack */
+    if (call->med_orig && (call->med_tp != call->med_orig)) {
+        pjmedia_transport_close(call->med_tp);
+        call->med_tp = call->med_orig;
+    }
+
 #if defined(PJMEDIA_HAS_SRTP) && (PJMEDIA_HAS_SRTP != 0)
     /* Check if SRTP requires secure signaling */
@@ -926 +932 @@
     pjmedia_transport_media_stop(call->med_tp);
 
-    if (call->med_tp != call->med_orig) {
+    if (call->med_orig && call->med_tp != call->med_orig) {
         pjmedia_transport_close(call->med_tp);
         call->med_tp = call->med_orig;
@@ -1022 +1028 @@
 
         /* No need because we need keepalive? */
+
+        /* Close upper entry of transport stack */
+        if (call->med_orig && (call->med_tp != call->med_orig)) {
+            pjmedia_transport_close(call->med_tp);
+            call->med_tp = call->med_orig;
+        }
 
     } else {
@@ -1823 +1835 @@
         status = pjmedia_snd_port_create(pjsua_var.pool, capture_dev,
                                          playback_dev, 
-                                         clock_rates[i], 1,
-                                         clock_rates[i]/fps,
+                                         clock_rates[i], 
+                                         pjsua_var.media_cfg.channel_count,
+                                         clock_rates[i]/fps * 
+                                         pjsua_var.media_cfg.channel_count,
                                          16, 0, &pjsua_var.snd_port);