Changeset 6043

Timestamp:

Jul 25, 2019 3:00:33 AM (5 years ago)

Author:

nanang

Message:

Fix #2215:

• Reset jitter buffer after Opus ptime decreased.
• Updated jitter buffer framelist sequence restart detection, also added some tracing logs.

Location:

pjproject/trunk/pjmedia/src/pjmedia

Files:

• jbuf.c (modified) (6 diffs)
• stream.c (modified) (1 diff)

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

@@ -45 +45 @@
  */
 #define INIT_CYCLE              10
+
+
+/* Maximum frame index in JB framelist (estimated).
+ * As index is calculated as (RTP-timestamp/timestamp-span), the maximum index
+ * usually ranging from MAXUINT32/9000 (10 fps video at 90kHz) to MAXUINT32/80
+ * (10 ms audio at 8000Hz), lets take the 'lowest'.
+ */
+#define MAX_FRAME_INDEX         (0xFFFFFFFF/9000)
 
 
@@ -471 +479 @@
     PJ_ASSERT_RETURN(frame_size <= framelist->frame_size, PJ_EINVAL);
 
-    /* too late or sequence restart */
-    if (index < framelist->origin) {
+    /* get distance of this frame to the first frame in the buffer */
+    distance = index - framelist->origin;
+
+    /* too late or sequence restart or far jump */
+    if (distance < 0) {
         if (framelist->origin - index < MAX_MISORDER) {
             /* too late */
+            TRACE__((THIS_FILE,"Put frame #%d: too late (distance=%d)",
+                               index, distance));
             return PJ_ETOOSMALL;
+        } else if (framelist->origin + framelist->size >= MAX_FRAME_INDEX) {
+            /* sequence restart */
+            TRACE__((THIS_FILE,"Put frame #%d: sequence restart (distance=%d, "
+                               "orig=%d, size=%d)",
+                               index, distance, framelist->origin,
+                               framelist->size));
+            framelist->origin = index - framelist->size;
+            distance = framelist->size;
         } else {
-            /* sequence restart */
-            framelist->origin = index - framelist->size;
+            /* jump too far, reset the buffer */
+            TRACE__((THIS_FILE,"Put frame #%d: far jump (distance=%d)",
+                               index, distance));
+            jb_framelist_reset(framelist);
+            framelist->origin = index;
+            distance = 0;
         }
     }
@@ -485 +510 @@
     if (framelist->size == 0) {
         pj_assert(framelist->discarded_num == 0);
+        TRACE__((THIS_FILE,"Put frame #%d: origin reset (from %d) as JB empty",
+                           index, framelist->origin));
         framelist->origin = index;
-    }
-
-    /* get distance of this frame to the first frame in the buffer */
-    distance = index - framelist->origin;
+        distance = 0;
+    }
 
     /* far jump, the distance is greater than buffer capacity */
@@ -495 +520 @@
         if (distance > MAX_DROPOUT) {
             /* jump too far, reset the buffer */
+            TRACE__((THIS_FILE,"Put frame #%d: far jump (distance=%d)",
+                               index, distance));
             jb_framelist_reset(framelist);
             framelist->origin = index;
@@ -500 +527 @@
         } else {
             /* otherwise, reject the frame */
+            TRACE__((THIS_FILE,"Put frame #%d: rejected due to JB full",
+                               index));
             return PJ_ETOOMANY;
         }
@@ -508 +537 @@
 
     /* if the slot is occupied, it must be duplicated frame, ignore it. */
-    if (framelist->frame_type[pos] != PJMEDIA_JB_MISSING_FRAME)
+    if (framelist->frame_type[pos] != PJMEDIA_JB_MISSING_FRAME) {
+        TRACE__((THIS_FILE,"Put frame #%d maybe a duplicate, ignored", index));
         return PJ_EEXISTS;
+    }
 
     /* put the frame into the slot */

pjproject/trunk/pjmedia/src/pjmedia/stream.c

@@ -1962 +1962 @@
             stream->dec_ptime = (pj_uint16_t)dec_ptime;
             pjmedia_jbuf_set_ptime(stream->jb, stream->dec_ptime);
+
+            /* Reset jitter buffer after ptime changed */
+            pjmedia_jbuf_reset(stream->jb);
         }