kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-26 22:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 262744 via svnmerge from

Browse Source 
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.1@262747 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2010-05-12 18:07:30 +00:00
parent afb107dedd
commit 3bed330b49
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
apps/app_meetme.c
View File

@@ -2764,6 +2764,10 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
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);
if (conf->transpath[idx]) {
@@ -2777,11 +2781,6 @@ static int conf_run(struct ast_channel *chan, struct ast_conference *conf, int c
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
*/