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

Timestamp:

May 17, 2008 2:54:18 PM (16 years ago)

Author:

nanang

Message:

More on ticket #535: updated files using and related to math.h

File:

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

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

@@ -25 +25 @@
 #include <pj/assert.h>
 #include <pj/log.h>
+#include <pj/math.h>
 #include <pj/string.h>
 
@@ -67 +68 @@
     int             jb_max_prefetch;      // Maximum allowable prefetch
     int             jb_status;            // status is 'init' until the first 'put' operation
-
-    int             jb_max_size;          // Maximum frames buffered ever
+    pj_math_stat    jb_delay;             // Delay statistics of jitter buffer (in frame unit)
 };
 
@@ -74 +74 @@
 #define JB_STATUS_INITIALIZING  0
 #define JB_STATUS_PROCESSING    1
-
-#define PJ_ABS(x)       ((x > 0) ? (x) : -(x))
-#define PJ_MAX(x, y)    ((x > y) ? (x) : (y))
-#define PJ_MIN(x, y)    ((x < y) ? (x) : (y))
-
 
 /* Enabling this would log the jitter buffer state about once per 
@@ -314 +309 @@
     jb->jb_max_count     = max_count;
 
+    pj_math_stat_init(&jb->jb_delay);
+
     *p_jb = jb;
     return PJ_SUCCESS;
@@ -369 +366 @@
     jb->jb_status        = JB_STATUS_INITIALIZING;
     jb->jb_max_hist_level = 0;
-    jb->jb_max_size      = 0;
 
     jb_framelist_remove_head(&jb->jb_framelist, 
                              jb_framelist_size(&jb->jb_framelist));
+
+    pj_math_stat_init(&jb->jb_delay);
+    
     return PJ_SUCCESS;
 }
@@ -389 +388 @@
     /* Update jb_max_size */
     cur_size = jb_framelist_size(&jb->jb_framelist);
-    if (cur_size > jb->jb_max_size)
-        jb->jb_max_size = cur_size;
 
     /* Only apply burst-level calculation on PUT operation since if VAD is 
@@ -457 +454 @@
         jb_framelist_remove_head(&jb->jb_framelist, diff);
 
+        pj_math_stat_update(&jb->jb_delay, cur_size - diff);
+
         TRACE__((jb->name.ptr, 
                  "JB shrinking %d frame(s), size=%d", diff,
                  jb_framelist_size(&jb->jb_framelist)));
+    } else {
+        pj_math_stat_update(&jb->jb_delay, cur_size);
     }
 
@@ -612 +613 @@
     state->max_prefetch = jb->jb_max_prefetch;
     state->size = jb_framelist_size(&jb->jb_framelist);
-    state->max_size = jb->jb_max_size;
+    state->avg_delay = jb->jb_delay.mean * jb->jb_frame_ptime;
+    state->min_delay = jb->jb_delay.min * jb->jb_frame_ptime;
+    state->max_delay = jb->jb_delay.max * jb->jb_frame_ptime;
+    state->dev_delay = pj_math_stat_get_stddev(&jb->jb_delay) * 
+                       jb->jb_frame_ptime;
 
     return PJ_SUCCESS;
 }
-