[svn-commits] rmudgett: trunk r414417 - in /trunk: ./ apps/app_meetme.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Thu May 22 11:19:13 2014
New Revision: 414417

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=414417
Log:
app_meetme: Don't interrupt MOH for waitmarked users.

Occasionally, when the last marked user leaves the conference, waitmarked
users don't get MOH if MOH is supposed to be played while a waitmarked
user is waiting for another marked user.

* Made not interrupt MOH when the user is a waitmarked user.  The
waitmarked user doesn't need to hear any leave announcements from the
conference as the user would have already heard different leave
announcements if they were enabled.  Apparently DAHDI occasionally sends
unending non-silent streams to these users or a normal user still in the
conference has continuous high background noise.  These non-silent streams
cause MOH to be suspended while the never ending "announcement" is played.

Issue caused by ASTERISK-13680.

AST-1349 #close
Reported by: Tyler Stewart

Review: https://reviewboard.asterisk.org/r/3543/
........

Merged revisions 414401 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 414402 from http://svn.asterisk.org/svn/asterisk/branches/11
........

Merged revisions 414404 from http://svn.asterisk.org/svn/asterisk/branches/12

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

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-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=414417&r1=414416&r2=414417
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Thu May 22 11:19:13 2014
@@ -4313,7 +4313,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) {
+								if (musiconhold
+									&& !ast_test_flag64(confflags, CONFFLAG_WAITMARKED)
+									&& !ast_dsp_silence(dsp, conf->origframe, &confsilence)
+									&& confsilence < MEETME_DELAYDETECTTALK) {
 									ast_moh_stop(chan);
 									mohtempstopped = 1;
 								}
@@ -4357,7 +4360,10 @@
 						ast_mutex_unlock(&conf->listenlock);
 					} else {
 bailoutandtrynormal:
-						if (musiconhold && !ast_dsp_silence(dsp, &fr, &confsilence) && confsilence < MEETME_DELAYDETECTTALK) {
+						if (musiconhold
+							&& !ast_test_flag64(confflags, CONFFLAG_WAITMARKED)
+							&& !ast_dsp_silence(dsp, &fr, &confsilence)
+							&& confsilence < MEETME_DELAYDETECTTALK) {
 							ast_moh_stop(chan);
 							mohtempstopped = 1;
 						}