Changeset 3568 for pjproject/branches/1.x/pjmedia/src/pjmedia/jbuf.c

Timestamp:

May 18, 2011 6:59:23 AM (13 years ago)

Author:

nanang

Message:

Fix #1258: Fixed bug in jitter buffer, i.e: unexpected state switches when prefetch mechanism is active, by separating prefetch mechanism from JB state.

File:

• pjproject/branches/1.x/pjmedia/src/pjmedia/jbuf.c (modified) (6 diffs)

pjproject/branches/1.x/pjmedia/src/pjmedia/jbuf.c

@@ -120 +120 @@
                                              continuously updated based on
                                              current frame burst level.     */
+    pj_bool_t       jb_prefetching;     /**< flag if jbuf is prefetching.   */
     int             jb_status;          /**< status is 'init' until the first 
                                              'put' operation                */
@@ -141 +142 @@
 #define JB_STATUS_INITIALIZING  0
 #define JB_STATUS_PROCESSING    1
-#define JB_STATUS_PREFETCHING   2
 
 
@@ -551 +551 @@
     jb->jb_init_cycle_cnt= 0;
     jb->jb_max_hist_level= 0;
+    jb->jb_prefetching   = (jb->jb_prefetch != 0);
 
     jb_framelist_reset(&jb->jb_framelist);
@@ -861 +862 @@
 
     if (status == PJ_SUCCESS) {
-        if (jb->jb_status == JB_STATUS_PREFETCHING) {
+        if (jb->jb_prefetching) {
             TRACE__((jb->jb_name.ptr, "PUT prefetch_cnt=%d/%d", 
                      new_size, jb->jb_prefetch));
             if (new_size >= jb->jb_prefetch)
-                jb->jb_status = JB_STATUS_PROCESSING;
+                jb->jb_prefetching = PJ_FALSE;
         }
         jb->jb_level += (new_size > cur_size ? new_size-cur_size : 1);
@@ -892 +893 @@
                                      pj_uint32_t *bit_info)
 {
-    if (jb->jb_status == JB_STATUS_PREFETCHING) {
+    if (jb->jb_prefetching) {
 
         /* Can't return frame because jitter buffer is filling up
@@ -939 +940 @@
             /* Jitter buffer is empty */
             if (jb->jb_prefetch)
-                jb->jb_status = JB_STATUS_PREFETCHING;
+                jb->jb_prefetching = PJ_TRUE;
 
             //pj_bzero(frame, jb->jb_frame_size);