kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-12 15:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug caused by a partially invalid frame (from the jitterbuffer) passing through the Asterisk core.

Browse Source 
(closes issue #15560)
Reported by: jvandal
(closes issue #15709)
Reported by: covici


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@228409 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2009-11-06 16:41:20 +00:00
parent aa51d30173
commit 3e10834b22
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/abstract_jb.c
View File

@@ -389,7 +389,7 @@ static void jb_get_and_deliver(struct ast_channel *chan)
struct ast_jb *jb = &chan->jb; struct ast_jb *jb = &chan->jb;
struct ast_jb_impl *jbimpl = jb->impl; struct ast_jb_impl *jbimpl = jb->impl;
void *jbobj = jb->jbobj; void *jbobj = jb->jbobj;
struct ast_frame *f, finterp; struct ast_frame *f, finterp = { .frametype = AST_FRAME_VOICE, };
long now; long now;
int interpolation_len, res; int interpolation_len, res;
@@ -418,13 +418,9 @@ static void jb_get_and_deliver(struct ast_channel *chan)
case JB_IMPL_INTERP: case JB_IMPL_INTERP:
/* interpolate a frame */ /* interpolate a frame */
f = &finterp; f = &finterp;
f->frametype = AST_FRAME_VOICE;
f->subclass = jb->last_format; f->subclass = jb->last_format;
f->datalen = 0;
f->samples = interpolation_len * 8; f->samples = interpolation_len * 8;
f->mallocd = 0;
f->src = "JB interpolation"; f->src = "JB interpolation";
f->data = NULL;
f->delivery = ast_tvadd(jb->timebase, ast_samp2tv(jb->next, 1000)); f->delivery = ast_tvadd(jb->timebase, ast_samp2tv(jb->next, 1000));
f->offset = AST_FRIENDLY_OFFSET; f->offset = AST_FRIENDLY_OFFSET;
/* deliver the interpolated frame */ /* deliver the interpolated frame */