[svn-commits] dvossel: branch 1.4 r262662 - /branches/1.4/apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Wed May 12 12:00:04 2010
New Revision: 262662

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=262662
Log:
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


Modified:
    branches/1.4/apps/app_meetme.c

Modified: branches/1.4/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.4/apps/app_meetme.c?view=diff&rev=262662&r1=262661&r2=262662
==============================================================================
--- branches/1.4/apps/app_meetme.c (original)
+++ branches/1.4/apps/app_meetme.c Wed May 12 12:00:04 2010
@@ -2352,6 +2352,10 @@
 						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 @@
 							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
 								*/