diff options
| author | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-12 17:00:04 +0000 |
|---|---|---|
| committer | dvossel <dvossel@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-05-12 17:00:04 +0000 |
| commit | 62866e13de478ad1794dd283545aa2f85768a7bb (patch) | |
| tree | 34eb9423786477c6d57f6cf4611568faa4fb79dc | |
| parent | b179b62a46cab844e9f294705a3aec0f12bfe08d (diff) | |
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.4@262662 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | apps/app_meetme.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/apps/app_meetme.c b/apps/app_meetme.c index 39b3a57f8..7872a96b2 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 */ |