From c24d9bdb6d251b7f478b11a44b310dd1fc3026be Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Fri, 6 Nov 2009 16:43:36 +0000 Subject: [PATCH] Merged revisions 228410 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r228410 | file | 2009-11-06 12:42:23 -0400 (Fri, 06 Nov 2009) | 14 lines Merged revisions 228409 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r228409 | file | 2009-11-06 12:41:20 -0400 (Fri, 06 Nov 2009) | 7 lines Fix a bug caused by a partially invalid frame (from the jitterbuffer) passing through the Asterisk core. (closes issue #15560) Reported by: jvandal (closes issue #15709) Reported by: covici ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@228411 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/abstract_jb.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/main/abstract_jb.c b/main/abstract_jb.c index 2599cb1790..af5b61431b 100644 --- a/main/abstract_jb.c +++ b/main/abstract_jb.c @@ -386,7 +386,7 @@ static void jb_get_and_deliver(struct ast_channel *chan) struct ast_jb *jb = &chan->jb; struct ast_jb_impl *jbimpl = jb->impl; void *jbobj = jb->jbobj; - struct ast_frame *f, finterp; + struct ast_frame *f, finterp = { .frametype = AST_FRAME_VOICE, }; long now; int interpolation_len, res; @@ -415,13 +415,9 @@ static void jb_get_and_deliver(struct ast_channel *chan) case JB_IMPL_INTERP: /* interpolate a frame */ f = &finterp; - f->frametype = AST_FRAME_VOICE; f->subclass = jb->last_format; - f->datalen = 0; f->samples = interpolation_len * 8; - f->mallocd = 0; f->src = "JB interpolation"; - f->data = NULL; f->delivery = ast_tvadd(jb->timebase, ast_samp2tv(jb->next, 1000)); f->offset = AST_FRIENDLY_OFFSET; /* deliver the interpolated frame */ -- 2.47.2