Changeset 3396 for pjproject/trunk/pjmedia/src/pjmedia/jbuf.c

Timestamp:

Dec 14, 2010 8:39:47 PM (13 years ago)

Author:

nanang

Message:

Fix #1188:

• Fixed jitter buffer progressive discard by returning 'missing' frame after discarded frame(s) so the PLC will be invoked to align the audio signal.
• Modified conditions in jitter buffer test data for this fix.

File:

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

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

@@ -262 +262 @@
 {
     if (framelist->size) {
+        pj_bool_t prev_discarded = PJ_FALSE;
 
         /* Skip discarded frames */
@@ -268 +269 @@
         {
             jb_framelist_remove_head(framelist, 1);
+            prev_discarded = PJ_TRUE;
         }
 
         /* Return the head frame if any */
         if (framelist->size) {
-            pj_memcpy(frame, 
-                      framelist->content + 
-                      framelist->head * framelist->frame_size,
-                      framelist->frame_size);
-            *p_type = (pjmedia_jb_frame_type) 
-                      framelist->frame_type[framelist->head];
-            if (size)
-                *size   = framelist->content_len[framelist->head];
-            if (bit_info)
-                *bit_info = framelist->bit_info[framelist->head];
+            if (prev_discarded) {
+                /* Ticket #1188: when previous frame(s) was discarded, return
+                 * 'missing' frame to trigger PLC to get smoother signal.
+                 */
+                *p_type = PJMEDIA_JB_MISSING_FRAME;
+                if (size)
+                    *size = 0;
+                if (bit_info)
+                    *bit_info = 0;
+            } else {
+                pj_memcpy(frame, 
+                          framelist->content + 
+                          framelist->head * framelist->frame_size,
+                          framelist->frame_size);
+                *p_type = (pjmedia_jb_frame_type) 
+                          framelist->frame_type[framelist->head];
+                if (size)
+                    *size   = framelist->content_len[framelist->head];
+                if (bit_info)
+                    *bit_info = framelist->bit_info[framelist->head];
+            }
 
             //pj_bzero(framelist->content +