Changeset 2019

Timestamp:

Jun 14, 2008 4:44:33 PM (16 years ago)

Author:

bennylp

Message:

More ticket #505: added constants to shrink the excess frames in jbuf even more slowly, default can only discard one excess frame per 200ms

File:

• pjproject/trunk/pjmedia/src/pjmedia/jbuf.c (modified) (5 diffs)

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

@@ -31 +31 @@
 #define THIS_FILE   "jbuf.c"
 
-#define SAFE_SHRINKING_DIFF     2
+#define SAFE_SHRINKING_DIFF     1
+#define MIN_SHRINK_GAP_MSEC     200
 #define USE_PREFETCH_BUFFERING  0
 
@@ -70 +71 @@
     int             jb_status;            // status is 'init' until the first 'put' operation
     pj_math_stat    jb_delay;             // Delay statistics of jitter buffer (in frame unit)
+
+    unsigned        jb_last_del_seq;      // Seq # of last frame deleted
+    unsigned        jb_min_shrink_gap;    // How often can we shrink
 };
 
@@ -319 +323 @@
     jb->jb_max_hist_level = 0;
     jb->jb_max_count     = max_count;
+    jb->jb_min_shrink_gap= MIN_SHRINK_GAP_MSEC / ptime;
 
     pj_math_stat_init(&jb->jb_delay);
@@ -458 +463 @@
     /* These code is used for shortening the delay in the jitter buffer. */
     diff = cur_size - jb->jb_prefetch;
-    if (diff > SAFE_SHRINKING_DIFF) {
+    if (diff > SAFE_SHRINKING_DIFF && 
+        jb->jb_framelist.flist_origin-jb->jb_last_del_seq > jb->jb_min_shrink_gap)
+    {
         /* Shrink slowly */
         diff = 1;
@@ -464 +471 @@
         /* Drop frame(s)! */
         jb_framelist_remove_head(&jb->jb_framelist, diff);
+        jb->jb_last_del_seq = jb->jb_framelist.flist_origin;
 
         pj_math_stat_update(&jb->jb_delay, cur_size - diff);