Changeset 2672 for pjproject/trunk

Timestamp:

May 1, 2009 3:13:01 PM (16 years ago)

Author:

nanang

Message:

Ticket #762: Fixed jitter buffer in handling DTX with relative short period of 'keep alive', e.g: Speex DTX seems to periodically send a keep alive frame every 20 silence frames.

Location:

pjproject/trunk/pjmedia

Files:

• build/Jbtest.dat (modified) (2 diffs)
• src/pjmedia/jbuf.c (modified) (3 diffs)

pjproject/trunk/pjmedia/build/Jbtest.dat

@@ -185 +185 @@
 !burst      1
 !discard    0
-!lost       3
-!empty      1
+!lost       7
+!empty      3
 !delay      3
 PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG
@@ -193 +193 @@
 # Normal
 PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG
+# More losts
+PLPGGGPPPGGGPLPGGGPG PLPGGGPPPGGGPLPGGGPG
+# Normal
+PGPGPGPGPGPGPGPGPGPG PGPGPGPGPGPGPGPGPGPG
 .
 

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

@@ -316 +316 @@
     assert(frame_size <= framelist->frame_size);
 
-    /* the first ever frame since inited/resetted. */
-    if (framelist->origin == INVALID_OFFSET)
-        framelist->origin = index;
-
     /* too late or duplicated or sequence restart */
     if (index < framelist->origin) {
@@ -331 +327 @@
     }
 
+    /* if jbuf is empty, just reset the origin */
+    if (framelist->size == 0) {
+        framelist->origin = index;
+    }
+
     /* get distance of this frame to the first frame in the buffer */
     distance = index - framelist->origin;
@@ -342 +343 @@
             distance = 0;
         } else {
-            if (framelist->size == 0) {
-                /* if jbuf is empty, process the frame */
-                framelist->origin = index;
-                distance = 0;
-            } else {
-                /* otherwise, reject the frame */
-                return PJ_ETOOMANY;
-            }
+            /* otherwise, reject the frame */
+            return PJ_ETOOMANY;
         }
     }