[svn-commits] dvossel: trunk r262744 - in /trunk: ./ apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Wed May 12 13:01:20 2010
New Revision: 262744

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

Modified:
    trunk/   (props changed)
    trunk/apps/app_meetme.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_meetme.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_meetme.c?view=diff&rev=262744&r1=262743&r2=262744
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Wed May 12 13:01:20 2010
@@ -3471,6 +3471,10 @@
 						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);
 								}
@@ -3486,11 +3490,6 @@
  							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
 								*/