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

Timestamp:

Feb 25, 2006 9:15:49 PM (18 years ago)

Author:

bennylp

Message:

Fixed echo in conference, and add ability to shrink buffer in jitter buffer

File:

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

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

@@ -24 +24 @@
 #include <pj/pool.h>
 #include <pj/assert.h>
+#include <pj/log.h>
 #include <pj/string.h>
 
+
+#define THIS_FILE   "jbuf.c"
 
 
@@ -55 +58 @@
     int             jb_max_hist_jitter;   // max jitter during the last jitter calculations
     int             jb_stable_hist;       // num of times the delay has been lower then the prefetch num
+    unsigned        jb_op_count;          // of of operations.
     int             jb_last_op;           // last operation executed on the framelist->flist_buffer (put/get)
     int             jb_last_seq_no;       // seq no. of the last frame inserted to the framelist->flist_buffer
@@ -293 +297 @@
     jb->jb_last_level = jb->jb_level;
     jb->jb_max_hist_jitter = PJ_MAX(jb->jb_max_hist_jitter,jb->jb_last_jitter);
-    
-    if (jb->jb_last_jitter< jb->jb_prefetch) {
+    jb->jb_op_count++;
+
+    if (jb->jb_last_jitter < jb->jb_prefetch) {
         jb->jb_stable_hist += jb->jb_last_jitter;
         if (jb->jb_stable_hist > STABLE_HISTORY_LIMIT) {
@@ -305 +310 @@
             jb->jb_stable_hist = 0;
             jb->jb_max_hist_jitter = 0;
+
+            if (jb->jb_op_count >= 100 &&
+                (int)jb_framelist_size(&jb->jb_framelist) > jb->jb_prefetch+2) 
+            {
+                jb_framelist_remove_head(&jb->jb_framelist,1);
+
+                PJ_LOG(5,(THIS_FILE, "jbuf prefetch: %d, size=%d", 
+                                 jb->jb_prefetch,
+                                 jb_framelist_size(&jb->jb_framelist)));
+                jb->jb_op_count = 0;
+            }
+
         }
     } else {
@@ -310 +327 @@
         jb->jb_stable_hist = 0;
         jb->jb_max_hist_jitter = 0;
+
+        if (jb->jb_op_count >= 100) {
+            if ((int)jb_framelist_size(&jb->jb_framelist) > jb->jb_prefetch+2) {
+                jb_framelist_remove_head(&jb->jb_framelist,1);
+
+                PJ_LOG(5,(THIS_FILE, "jbuf prefetch: %d, size=%d", 
+                                 jb->jb_prefetch,
+                                 jb_framelist_size(&jb->jb_framelist)));
+            }
+
+            jb->jb_op_count = 0;
+        }
     }
 }