Changeset 4097 for pjproject

Timestamp:

Apr 26, 2012 3:42:38 PM (13 years ago)

Author:

nanang

Message:

Misc (re #1417): reverted back accidental jbuf modification in r4004.

File:

• pjproject/branches/1.x/pjmedia/src/pjmedia/jbuf.c (modified) (6 diffs)

pjproject/branches/1.x/pjmedia/src/pjmedia/jbuf.c

@@ -167 +167 @@
  * second.
  */
-#if 0
+#if 1
 #  define TRACE__(args)     PJ_LOG(5,args)
 #else
@@ -405 +405 @@
         if (framelist->origin - index < MAX_MISORDER) {
             /* too late */
-            PJ_LOG(5,(THIS_FILE, "frame too late (origin: %d, index: %d, size: %d, max: %d)",
-                                 framelist->origin, index, framelist->size, framelist->max_count));
             return PJ_ETOOSMALL;
         } else {
             /* sequence restart */
-            PJ_LOG(5,(THIS_FILE, "sequence restart (origin: %d, index: %d, size: %d, max: %d)",
-                                 framelist->origin, index, framelist->size, framelist->max_count));
             framelist->origin = index - framelist->size;
         }
@@ -429 +425 @@
         if (distance > MAX_DROPOUT) {
             /* jump too far, reset the buffer */
-            PJ_LOG(5,(THIS_FILE, "jump too far, resetting (origin: %d, index: %d, size: %d, max: %d)",
-                                 framelist->origin, index, framelist->size, framelist->max_count));
             jb_framelist_reset(framelist);
             framelist->origin = index;
@@ -436 +430 @@
         } else {
             /* otherwise, reject the frame */
-            PJ_LOG(5,(THIS_FILE, "frame too far (origin: %d, index: %d, size: %d, max: %d)",
-                                 framelist->origin, index, framelist->size, framelist->max_count));
             return PJ_ETOOMANY;
         }
@@ -446 +438 @@
 
     /* if the slot is occupied, it must be duplicated frame, ignore it. */
-    if (framelist->frame_type[pos] != PJMEDIA_JB_MISSING_FRAME) {
-        PJ_LOG(5,(THIS_FILE, "exists (origin: %d, index: %d, size: %d, max: %d)",
-                              framelist->origin, index, framelist->size, framelist->max_count));
+    if (framelist->frame_type[pos] != PJMEDIA_JB_MISSING_FRAME)
         return PJ_EEXISTS;
-    }
 
     /* put the frame into the slot */
@@ -529 +518 @@
     pj_math_stat_init(&jb->jb_burst);
 
-    //pjmedia_jbuf_set_discard(jb, PJMEDIA_JB_DISCARD_PROGRESSIVE);
-    pjmedia_jbuf_set_discard(jb, PJMEDIA_JB_DISCARD_STATIC);
-    //pjmedia_jbuf_set_discard(jb, PJMEDIA_JB_DISCARD_NONE);
+    pjmedia_jbuf_set_discard(jb, PJMEDIA_JB_DISCARD_PROGRESSIVE);
     pjmedia_jbuf_reset(jb);