From: David Vossel <dvossel@digium.com>
Date: Wed, 12 May 2010 17:00:04 +0000 (+0000)
Subject: fixes app_meetme dsp error
X-Git-Tag: 1.4.33-rc1~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dbcb9d1577e919bc2c328ff73bf64c163a1d9aea;p=thirdparty%2Fasterisk.git

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: https://origsvn.digium.com/svn/asterisk/branches/1.4@262662 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 39b3a57f8d..7872a96b2d 100644
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2352,6 +2352,10 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
 						ast_mutex_lock(&conf->listenlock);
 						if (!conf->transframe[index]) {
 							if (conf->origframe) {
+								if (musiconhold && !ast_dsp_silence(dsp, conf->origframe, &confsilence) && confsilence < MEETME_DELAYDETECTTALK) {
+									ast_moh_stop(chan);
+									mohtempstopped = 1;
+								}
 								if (!conf->transpath[index])
 									conf->transpath[index] = ast_translator_build_path((1 << index), AST_FORMAT_SLINEAR);
 								if (conf->transpath[index]) {
@@ -2365,11 +2369,6 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
 							if ((conf->transframe[index]->frametype != AST_FRAME_NULL) &&
 							    can_write(chan, confflags)) {
 								struct ast_frame *cur;
-								if (musiconhold && !ast_dsp_silence(dsp, conf->transframe[index], &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
 								*/