Changeset 4097


Ignore:
Timestamp:
Apr 26, 2012 3:42:38 PM (7 years ago)
Author:
nanang
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/branches/1.x/pjmedia/src/pjmedia/jbuf.c

    r4004 r4097  
    167167 * second. 
    168168 */ 
    169 #if 0 
     169#if 1 
    170170#  define TRACE__(args)     PJ_LOG(5,args) 
    171171#else 
     
    405405        if (framelist->origin - index < MAX_MISORDER) { 
    406406            /* too late */ 
    407             PJ_LOG(5,(THIS_FILE, "frame too late (origin: %d, index: %d, size: %d, max: %d)", 
    408                                  framelist->origin, index, framelist->size, framelist->max_count)); 
    409407            return PJ_ETOOSMALL; 
    410408        } else { 
    411409            /* sequence restart */ 
    412             PJ_LOG(5,(THIS_FILE, "sequence restart (origin: %d, index: %d, size: %d, max: %d)", 
    413                                  framelist->origin, index, framelist->size, framelist->max_count)); 
    414410            framelist->origin = index - framelist->size; 
    415411        } 
     
    429425        if (distance > MAX_DROPOUT) { 
    430426            /* jump too far, reset the buffer */ 
    431             PJ_LOG(5,(THIS_FILE, "jump too far, resetting (origin: %d, index: %d, size: %d, max: %d)", 
    432                                  framelist->origin, index, framelist->size, framelist->max_count)); 
    433427            jb_framelist_reset(framelist); 
    434428            framelist->origin = index; 
     
    436430        } else { 
    437431            /* otherwise, reject the frame */ 
    438             PJ_LOG(5,(THIS_FILE, "frame too far (origin: %d, index: %d, size: %d, max: %d)", 
    439                                  framelist->origin, index, framelist->size, framelist->max_count)); 
    440432            return PJ_ETOOMANY; 
    441433        } 
     
    446438 
    447439    /* if the slot is occupied, it must be duplicated frame, ignore it. */ 
    448     if (framelist->frame_type[pos] != PJMEDIA_JB_MISSING_FRAME) { 
    449         PJ_LOG(5,(THIS_FILE, "exists (origin: %d, index: %d, size: %d, max: %d)", 
    450                               framelist->origin, index, framelist->size, framelist->max_count)); 
     440    if (framelist->frame_type[pos] != PJMEDIA_JB_MISSING_FRAME) 
    451441        return PJ_EEXISTS; 
    452     } 
    453442 
    454443    /* put the frame into the slot */ 
     
    529518    pj_math_stat_init(&jb->jb_burst); 
    530519 
    531     //pjmedia_jbuf_set_discard(jb, PJMEDIA_JB_DISCARD_PROGRESSIVE); 
    532     pjmedia_jbuf_set_discard(jb, PJMEDIA_JB_DISCARD_STATIC); 
    533     //pjmedia_jbuf_set_discard(jb, PJMEDIA_JB_DISCARD_NONE); 
     520    pjmedia_jbuf_set_discard(jb, PJMEDIA_JB_DISCARD_PROGRESSIVE); 
    534521    pjmedia_jbuf_reset(jb); 
    535522 
Note: See TracChangeset for help on using the changeset viewer.