Changeset 2310

Timestamp:

Sep 23, 2008 4:55:21 PM (16 years ago)

Author:

nanang

Message:

Ticket #638:

• Jitter buffer shrinking is done based on max_hist_level (recent maximum burst level).
• Updated jitter buffer to maintain max_hist_level, instead of resetting it each time current level is updated.
• Updated default jitter buffer size in stream.c from 360ms to 500ms to accomodate more burst level.

Location:

pjproject/trunk/pjmedia/src/pjmedia

Files:

• jbuf.c (modified) (5 diffs)
• stream.c (modified) (1 diff)

pjproject/trunk/pjmedia/src/pjmedia/jbuf.c

@@ -402 +402 @@
     int diff, cur_size;
 
-    /* Update jb_max_size */
     cur_size = jb_framelist_size(&jb->jb_framelist);
 
@@ -423 +422 @@
              */
             if (jb->jb_stable_hist > STABLE_HISTORY_LIMIT) {
+                
+                /* Update max_hist_level. */
+                jb->jb_max_hist_level = jb->jb_prefetch;
+
                 diff = (jb->jb_prefetch - jb->jb_max_hist_level) / 3;
 
@@ -432 +435 @@
                     jb->jb_prefetch = jb->jb_min_prefetch;
 
+                jb->jb_stable_hist = 0;
+
                 TRACE__((jb->name.ptr,"jb updated(1), prefetch=%d, size=%d", 
                          jb->jb_prefetch, cur_size));
-
-                jb->jb_stable_hist = 0;
-                jb->jb_max_hist_level = 0;
             }
         }
@@ -448 +450 @@
             if (jb->jb_prefetch > jb->jb_max_prefetch)
                 jb->jb_prefetch = jb->jb_max_prefetch;
+
             jb->jb_stable_hist = 0;
-            jb->jb_max_hist_level = 0;
+            // Keep max_hist_level.
+            //jb->jb_max_hist_level = 0;
 
             TRACE__((jb->name.ptr,"jb updated(2), prefetch=%d, size=%d", 
@@ -462 +466 @@
 
     /* These code is used for shortening the delay in the jitter buffer. */
-    diff = cur_size - jb->jb_prefetch;
+    // Shrinking based on max_hist_level (recent max level).
+    //diff = cur_size - jb->jb_prefetch;
+    diff = cur_size - jb->jb_max_hist_level;
     if (diff > SAFE_SHRINKING_DIFF && 
         jb->jb_framelist.flist_origin-jb->jb_last_del_seq > jb->jb_min_shrink_gap)

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

@@ -1668 +1668 @@
         jb_max = info->jb_max;
     else
-        jb_max = 360 / stream->codec_param.info.frm_ptime;
+        jb_max = 500 / stream->codec_param.info.frm_ptime;
 
     if (info->jb_min_pre >= 0)