Changeset 1922 for pjproject/trunk/pjmedia/src/pjmedia/jbuf.c

Timestamp:

Apr 10, 2008 11:51:04 AM (16 years ago)

Author:

bennylp

Message:

More ticket #505: the jitter buffer only discard one packet at a time when optimizing the delay

File:

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

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

@@ -84 +84 @@
  */
 #if 1
-#  define TRACE__(args)     PJ_LOG(4,args)
+#  define TRACE__(args)     PJ_LOG(5,args)
 #else
 #  define TRACE__(args)
@@ -396 +396 @@
         if (jb->jb_level < jb->jb_prefetch) {
 
-            static const int stable_history_limit = 100;
+            enum { STABLE_HISTORY_LIMIT = 100 };
             
             jb->jb_stable_hist++;
@@ -403 +403 @@
              * (not just short time impulse)
              */
-            if (jb->jb_stable_hist > (int)stable_history_limit) {
+            if (jb->jb_stable_hist > STABLE_HISTORY_LIMIT) {
                 diff = (jb->jb_prefetch - jb->jb_max_hist_level) / 3;
 
@@ -445 +445 @@
     diff = jb_framelist_size(&jb->jb_framelist) - jb->jb_prefetch;
     if (diff > SAFE_SHRINKING_DIFF) {
-        
-        /* Drop some frames so jitter buffer size should be == jb_prefetch */
+        /* Shrink slowly */
+        diff = 1;
+
+        /* Drop frame(s)! */
         jb_framelist_remove_head(&jb->jb_framelist, diff);
 
         TRACE__((jb->name.ptr, 
-                 "JB shrinking %d frames, size=%d", diff,
+                 "JB shrinking %d frame(s), size=%d", diff,
                  jb_framelist_size(&jb->jb_framelist)));
     }