Changeset 4004


Ignore:
Timestamp:
Apr 2, 2012 8:30:58 AM (8 years ago)
Author:
bennylp
Message:

Re #1417: removed the obsolete but misleading sip_transport_tls_ossl.c file

Location:
pjproject/branches/1.x
Files:
1 deleted
1 edited

Legend:

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

    r3814 r4004  
    167167 * second. 
    168168 */ 
    169 #if 1 
     169#if 0 
    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)); 
    407409            return PJ_ETOOSMALL; 
    408410        } else { 
    409411            /* 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)); 
    410414            framelist->origin = index - framelist->size; 
    411415        } 
     
    425429        if (distance > MAX_DROPOUT) { 
    426430            /* 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)); 
    427433            jb_framelist_reset(framelist); 
    428434            framelist->origin = index; 
     
    430436        } else { 
    431437            /* 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)); 
    432440            return PJ_ETOOMANY; 
    433441        } 
     
    438446 
    439447    /* if the slot is occupied, it must be duplicated frame, ignore it. */ 
    440     if (framelist->frame_type[pos] != PJMEDIA_JB_MISSING_FRAME) 
     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)); 
    441451        return PJ_EEXISTS; 
     452    } 
    442453 
    443454    /* put the frame into the slot */ 
     
    518529    pj_math_stat_init(&jb->jb_burst); 
    519530 
    520     pjmedia_jbuf_set_discard(jb, PJMEDIA_JB_DISCARD_PROGRESSIVE); 
     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); 
    521534    pjmedia_jbuf_reset(jb); 
    522535 
Note: See TracChangeset for help on using the changeset viewer.