diff options
author | Nanang Izzuddin <nanang@teluu.com> | 2012-04-26 15:42:38 +0000 |
---|---|---|
committer | Nanang Izzuddin <nanang@teluu.com> | 2012-04-26 15:42:38 +0000 |
commit | d0142c65286495eaaab484db139908169384ffcf (patch) | |
tree | 80bc2bbe61125f8450554e5fc39b6bfb62fc9d23 /pjmedia/src | |
parent | 5e25079474da790c348688f77535fcf06b44afc6 (diff) |
Misc (re #1417): reverted back accidental jbuf modification in r4004.
git-svn-id: http://svn.pjsip.org/repos/pjproject/branches/1.x@4097 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src')
-rw-r--r-- | pjmedia/src/pjmedia/jbuf.c | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/pjmedia/src/pjmedia/jbuf.c b/pjmedia/src/pjmedia/jbuf.c index 4c7762d4..db4491a2 100644 --- a/pjmedia/src/pjmedia/jbuf.c +++ b/pjmedia/src/pjmedia/jbuf.c @@ -166,7 +166,7 @@ struct pjmedia_jbuf /* Enabling this would log the jitter buffer state about once per * second. */ -#if 0 +#if 1 # define TRACE__(args) PJ_LOG(5,args) #else # define TRACE__(args) @@ -404,13 +404,9 @@ static pj_status_t jb_framelist_put_at(jb_framelist_t *framelist, if (index < framelist->origin) { 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; } } @@ -428,15 +424,11 @@ static pj_status_t jb_framelist_put_at(jb_framelist_t *framelist, if (distance >= (int)framelist->max_count) { 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; distance = 0; } 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; } } @@ -445,11 +437,8 @@ static pj_status_t jb_framelist_put_at(jb_framelist_t *framelist, pos = (framelist->head + distance) % framelist->max_count; /* 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 */ framelist->frame_type[pos] = frame_type; @@ -528,9 +517,7 @@ PJ_DEF(pj_status_t) pjmedia_jbuf_create(pj_pool_t *pool, pj_math_stat_init(&jb->jb_delay); 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); *p_jb = jb; |