Changeset 2583 for pjproject/trunk

Timestamp:

Apr 7, 2009 11:16:24 PM (16 years ago)

Author:

nanang

Message:

Ticket #762: Fixed jbuf in handling far sequence jump (the distance is over jbuf capacity) while jbuf is empty.

File:

• pjproject/trunk/pjmedia/src/pjmedia/jbuf.c (modified) (1 diff)

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

@@ -336 +336 @@
     }
 
-    /* too soon or jump too far */
+    /* get distance of this frame to the first frame in the buffer */
     distance = index - framelist->origin;
+
+    /* far jump, the distance is greater than buffer capacity */
     if (distance >= (int)framelist->max_count) {
         if (distance > MAX_DROPOUT) {
-            /* jump too far */
+            /* jump too far, reset the buffer */
             jb_framelist_reset(framelist);
             framelist->origin = index;
             distance = 0;
         } else {
-            /* too soon, buffer is not enough */
-            return PJ_ETOOMANY;
+            if (framelist->size == 0) {
+                /* if jbuf is empty, process the frame */
+                framelist->origin = index;
+                distance = 0;
+            } else {
+                /* otherwise, reject the frame */
+                return PJ_ETOOMANY;
+            }
         }
     }