Changeset 428

Timestamp:

May 2, 2006 5:49:31 PM (18 years ago)

Author:

bennylp

Message:

Changed jbuf param name in stream_info, and generate random SSRC for RTP/RTCP instead of zero.

Location:

pjproject/trunk/pjmedia

Files:

• include/pjmedia/stream.h (modified) (1 diff)
• src/pjmedia/session.c (modified) (2 diffs)
• src/pjmedia/stream.c (modified) (1 diff)

pjproject/trunk/pjmedia/include/pjmedia/stream.h

@@ -77 +77 @@
     int                 rx_event_pt;/**< Incoming pt for telephone-events.  */
     pj_uint32_t         ssrc;       /**< RTP SSRC.                          */
-    int                 jb_min;     /**< Jitter buffer min delay.           */
-    int                 jb_max;     /**< Jitter buffer max delay.           */
-    int                 jb_maxcnt;  /**< Jitter buffer max delay.           */
+    int                 jb_init;    /**< Jitter buffer init delay in msec.  */
+    int                 jb_max;     /**< Jitter buffer max delay in msec.   */
 };
 

pjproject/trunk/pjmedia/src/pjmedia/session.c

@@ -25 +25 @@
 #include <pj/assert.h>
 #include <pj/ctype.h>
+#include <pj/rand.h>
 
 
@@ -335 +336 @@
 
 
-    /* Leave SSRC to zero. */
+    /* Leave SSRC to random. */
+    si->ssrc = pj_rand();
 
     /* Leave jitter buffer parameter. */

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

@@ -902 +902 @@
 
     /* Create jitter buffer: */
-    jbuf_init = 100 / (stream->port.info.samples_per_frame * 1000 / 
-                       info->fmt.clock_rate);
-    jbuf_max = 600 / (stream->port.info.samples_per_frame * 1000 / 
-                       info->fmt.clock_rate);
+    if (info->jb_init)
+        jbuf_init = info->jb_init;
+    else
+        jbuf_init = 60 / (stream->port.info.samples_per_frame * 1000 / 
+                          info->fmt.clock_rate);
+
+    if (info->jb_max)
+        jbuf_max = info->jb_max;
+    else
+        jbuf_max = 240 / (stream->port.info.samples_per_frame * 1000 / 
+                           info->fmt.clock_rate);
     status = pjmedia_jbuf_create(pool, &stream->port.info.name,
                                  stream->frame_size,