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

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index f2c2aff869cbffece4b98b9dd764b8237d4d2a8e..9d4b57d225763d5fb55874ca9658179f17616628 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -2711,6 +2711,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]) {
@@ -2724,11 +2728,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
                                                                */