Changeset 3154 for pjproject/trunk

Timestamp:

Apr 30, 2010 10:22:05 AM (15 years ago)

Author:

nanang

Message:

Re #969: Fixed bug division by zero in JB progressive discard code, caused by possibility of uninitialized burst level after JB switches status INITIALIZING -> PROCESSING (thanks Janos Tolgyesi and Tamàs Solymosi for the report and investigation).

File:

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

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

@@ -649 +649 @@
             if (++jb->jb_init_cycle_cnt >= INIT_CYCLE && oper == JB_OP_GET) {
                 jb->jb_status = JB_STATUS_PROCESSING;
+                /* To make sure the burst calculation will be done right after
+                 * this, adjust burst level if it exceeds max burst level.
+                 */
+                jb->jb_level = PJ_MIN(jb->jb_level, jb->jb_max_burst);
             } else {
                 jb->jb_level = 0;
@@ -661 +665 @@
          * calculation.
          */
-        if (oper == JB_OP_GET && jb->jb_level < jb->jb_max_burst)
+        if (oper == JB_OP_GET && jb->jb_level <= jb->jb_max_burst)
             jbuf_calculate_jitter(jb);