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

Timestamp:

Apr 28, 2008 6:05:49 PM (15 years ago)

Author:

bennylp

Message:

Ticket #513: Support for RTCP XR (initial patch)

File:

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

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

@@ -68 +68 @@
     int             jb_status;            // status is 'init' until the first 'put' operation
 
-
+    int             jb_max_size;          // Maximum frames buffered ever
 };
 
@@ -369 +369 @@
     jb->jb_status        = JB_STATUS_INITIALIZING;
     jb->jb_max_hist_level = 0;
+    jb->jb_max_size      = 0;
 
     jb_framelist_remove_head(&jb->jb_framelist, 
@@ -384 +385 @@
 static void jbuf_calculate_jitter(pjmedia_jbuf *jb)
 {
-    int diff;
+    int diff, cur_size;
+
+    /* 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 
@@ -414 +420 @@
 
                 TRACE__((jb->name.ptr,"jb updated(1), prefetch=%d, size=%d", 
-                         jb->jb_prefetch, jb_framelist_size(&jb->jb_framelist)));
+                         jb->jb_prefetch, cur_size));
 
                 jb->jb_stable_hist = 0;
@@ -433 +439 @@
 
             TRACE__((jb->name.ptr,"jb updated(2), prefetch=%d, size=%d", 
-                     jb->jb_prefetch, jb_framelist_size(&jb->jb_framelist)));
+                     jb->jb_prefetch, cur_size));
         }
 
@@ -443 +449 @@
 
     /* These code is used for shortening the delay in the jitter buffer. */
-    diff = jb_framelist_size(&jb->jb_framelist) - jb->jb_prefetch;
+    diff = cur_size - jb->jb_prefetch;
     if (diff > SAFE_SHRINKING_DIFF) {
         /* Shrink slowly */
@@ -471 +477 @@
                                      pj_size_t frame_size, 
                                      int frame_seq)
+{
+    pjmedia_jbuf_put_frame2(jb, frame, frame_size, frame_seq, NULL);
+}
+
+PJ_DEF(void) pjmedia_jbuf_put_frame2(pjmedia_jbuf *jb, 
+                                     const void *frame, 
+                                     pj_size_t frame_size, 
+                                     int frame_seq,
+                                     pj_bool_t *discarded)
 {
     pj_size_t min_frame_size;
@@ -494 +509 @@
 
         while (jb_framelist_put_at(&jb->jb_framelist,
-                                   frame_seq,frame,min_frame_size) ==PJ_FALSE)
+                                   frame_seq,frame,min_frame_size) == PJ_FALSE)
         {
             jb_framelist_remove_head(&jb->jb_framelist,
@@ -503 +518 @@
             jb->jb_prefetch_cnt += seq_diff;
 
+        if (discarded)
+            *discarded = PJ_FALSE;
     }
     else
     {
-        jb_framelist_put_at(&jb->jb_framelist,frame_seq,frame,min_frame_size);
+        pj_bool_t res;
+        res = jb_framelist_put_at(&jb->jb_framelist,frame_seq,frame,
+                                  min_frame_size);
+        if (discarded)
+            *discarded = !res;
     }
 }
@@ -591 +612 @@
     state->max_prefetch = jb->jb_max_prefetch;
     state->size = jb_framelist_size(&jb->jb_framelist);
+    state->max_size = jb->jb_max_size;
 
     return PJ_SUCCESS;