Ticket #1189: ticket-1189.patch

pjmedia/src/pjmedia/jbuf.c

@@ -758 +758 @@
         /* Calculating discard interval (aggressiveness) based on
          * (current size / burst level).
          */
-        if (jb->jb_status == JB_STATUS_PROCESSING) {
+        if (cur_size >= 0 && jb->jb_status == JB_STATUS_PROCESSING) {
             burst_level = PJ_MAX(jb->jb_eff_level, jb->jb_level);
             burst_factor = cur_size / burst_level;
             /* Tolerate small spikes */
@@ -791 +791 @@
          * from the last frame discarded.
          */
         seq_delta = (pj_uint16_t)(frame_seq - jb->jb_last_discard_seq);
-        if ((0 != interval) && (seq_delta >= interval)) {
-            frame_type = PJMEDIA_JB_DISCARDED_FRAME;
-            jb->jb_last_discard_seq = frame_seq;
+        if (interval != 0) {
+            if (seq_delta >= interval) {
+                frame_type = PJMEDIA_JB_DISCARDED_FRAME;
+                jb->jb_last_discard_seq = frame_seq;
 
-            TRACE__((jb->jb_name.ptr, 
-                    "Discarding frame #%d: eff=%d disc=%d orig:%d"
-                    " seq_delta:%d",
-                    frame_seq,
-                    cur_size,
-                    jb_framelist_size(&jb->jb_framelist) - cur_size,
-                    jb_framelist_origin(&jb->jb_framelist),
-                    (int)seq_delta));
+                TRACE__((jb->jb_name.ptr,
+                        "Discarding frame #%d: eff=%d disc=%d orig:%d"
+                        " seq_delta:%d bf:%d",
+                        frame_seq,
+                        cur_size,
+                        jb_framelist_size(&jb->jb_framelist) - cur_size,
+                        jb_framelist_origin(&jb->jb_framelist),
+                        (int)seq_delta, burst_factor));
+            } else if (seq_delta == 1) {
+                frame_type = PJMEDIA_JB_ZERO_EMPTY_FRAME;
+                //jb->jb_last_discard_seq = frame_seq;
+
+                TRACE__((jb->jb_name.ptr,
+                        "Concealing Discarded frame #%d: eff=%d disc=%d"
+                        " orig:%d seq_delta:%d b:%d",
+                        frame_seq,
+                        cur_size,
+                        jb_framelist_size(&jb->jb_framelist) - cur_size,
+                        jb_framelist_origin(&jb->jb_framelist),
+                        (int)seq_delta, burst_factor));
+            }
         }
     }
 #endif /* PROGRESSIVE_DISCARD */
-    
 
+
     /* Attempt to store the frame */
     min_frame_size = PJ_MIN(frame_size, jb->jb_frame_size);
     status = jb_framelist_put_at(&jb->jb_framelist, frame_seq, frame,