From f62c1d022cf68913a7a702ac900d47c2632aa833 Mon Sep 17 00:00:00 2001 From: dvossel Date: Wed, 12 May 2010 18:07:30 +0000 Subject: Merged revisions 262744 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ................ r262744 | dvossel | 2010-05-12 13:01:20 -0500 (Wed, 12 May 2010) | 17 lines Merged revisions 262662 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r262662 | dvossel | 2010-05-12 12:00:04 -0500 (Wed, 12 May 2010) | 11 lines fixes app_meetme dsp error We attempted to detect silence after translating a frame from signed linear. This caused a flooding of errors. To resolve this the code to detect silence was moved before the translation. (closes issue #17133) Reported by: jsdyer ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@262747 f38db490-d61c-443f-a65b-d21fe96a405b --- apps/app_meetme.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 3fc48b030..d6de2435e 100644 --- a/apps/app_meetme.c +++ b/apps/app_meetme.c @@ -2764,6 +2764,10 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c ast_mutex_lock(&conf->listenlock); if (!conf->transframe[idx]) { if (conf->origframe) { + if (musiconhold && !ast_dsp_silence(dsp, conf->origframe, &confsilence) && confsilence < MEETME_DELAYDETECTTALK) { + ast_moh_stop(chan); + mohtempstopped = 1; + } if (!conf->transpath[idx]) conf->transpath[idx] = ast_translator_build_path((1 << idx), AST_FORMAT_SLINEAR); if (conf->transpath[idx]) { @@ -2777,11 +2781,6 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c if ((conf->transframe[idx]->frametype != AST_FRAME_NULL) && can_write(chan, confflags)) { struct ast_frame *cur; - if (musiconhold && !ast_dsp_silence(dsp, conf->transframe[idx], &confsilence) && confsilence < MEETME_DELAYDETECTTALK) { - ast_moh_stop(chan); - mohtempstopped = 1; - } - /* the translator may have returned a list of frames, so write each one onto the channel */ -- cgit v1.2.3