From 90a497c3b81c4cda67cfda52dbddda3b0c29e0ee Mon Sep 17 00:00:00 2001 From: Mark Spencer Date: Fri, 27 Aug 2004 22:53:56 +0000 Subject: [PATCH] Fix generator for VAD as well as for automatically syncing to incoming signal if present (bug #2312) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@3668 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channel.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/channel.c b/channel.c index f58209f74b..f770b98d64 100755 --- a/channel.c +++ b/channel.c @@ -1,4 +1,4 @@ - /* +/* * Asterisk -- A telephony toolkit for Linux. * * Channel Management @@ -1359,12 +1359,16 @@ struct ast_frame *ast_read(struct ast_channel *chan) } /* Run any generator sitting on the line */ - if (f && (f->frametype == AST_FRAME_VOICE) && chan->generatordata && !chan->timingfunc) { + if (f && (f->frametype == AST_FRAME_VOICE) && chan->generatordata) { /* Mask generator data temporarily and apply. If there is a timing function, it will be calling the generator instead */ void *tmp; int res; int (*generate)(struct ast_channel *chan, void *tmp, int datalen, int samples); + if (chan->timingfunc) { + ast_log(LOG_DEBUG, "Generator got voice, switching to phase locked mode\n"); + ast_settimeout(chan, 0, NULL, NULL); + } tmp = chan->generatordata; chan->generatordata = NULL; generate = chan->generator->generate; @@ -1374,6 +1378,11 @@ struct ast_frame *ast_read(struct ast_channel *chan) ast_log(LOG_DEBUG, "Auto-deactivating generator\n"); ast_deactivate_generator(chan); } + } else if (f && (f->frametype == AST_FRAME_CNG)) { + if (chan->generator && !chan->timingfunc && (chan->timingfd > -1)) { + ast_log(LOG_DEBUG, "Generator got CNG, switching to zap timed mode\n"); + ast_settimeout(chan, 160, generator_force, chan); + } } if (chan->fin & 0x80000000) ast_frame_dump(chan->name, f, "<<"); -- 2.47.2