<h1>Project "FreeSWITCH Source" received a push.</h1>
<h2>branch: master updated</h2>
<pre>
via: a79b64ee2016ba90af72821990d8ae678c96623d (commit)
from: 1ba1c57eff854f13e34e8f03a012f5442cb69b36 (commit)
</pre>= COMMIT LOG ===========================================================
<div class="highlight"><pre>committer: Anthony Minessale
comments:
more agc
<span style="color: #000080; font-weight: bold">diff --git a/src/mod/applications/mod_conference/mod_conference.c b/src/mod/applications/mod_conference/mod_conference.c</span>
<span style="color: #000080; font-weight: bold">index 92ca104..1fc4ed5 100644</span>
<span style="color: #A00000">--- a/src/mod/applications/mod_conference/mod_conference.c</span>
<span style="color: #00A000">+++ b/src/mod/applications/mod_conference/mod_conference.c</span>
<span style="color: #800080; font-weight: bold">@@ -311,6 +311,7 @@ struct conference_member {</span>
switch_buffer_t *resample_buffer;
uint32_t flags;
uint32_t score;
<span style="color: #00A000">+ uint32_t last_score;</span>
uint32_t score_iir;
switch_mutex_t *flag_mutex;
switch_mutex_t *write_mutex;
<span style="color: #800080; font-weight: bold">@@ -2126,20 +2127,26 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v</span>
switch_test_flag(member, MFLAG_CAN_SPEAK) &&
noise_gate_check(member)
) {
<span style="color: #00A000">+ int last_shift = abs(member->last_score - member->score);</span>
<span style="color: #A00000">- member->avg_tally += member->score;</span>
<span style="color: #A00000">- member->avg_itt++;</span>
<span style="color: #A00000">- if (!member->avg_itt) member->avg_itt++;</span>
<span style="color: #A00000">- member->avg_score = member->avg_tally / member->avg_itt;</span>
<span style="color: #A00000">- </span>
<span style="color: #00A000">+ if (member->score && member->last_score && last_shift > 900) {</span>
<span style="color: #00A000">+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG7,</span>
<span style="color: #00A000">+ "AGC %s:%d drop anomalous shift of %d\n", </span>
<span style="color: #00A000">+ member->conference->name,</span>
<span style="color: #00A000">+ member->id, last_shift);</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ } else {</span>
<span style="color: #00A000">+ member->avg_tally += member->score;</span>
<span style="color: #00A000">+ member->avg_itt++;</span>
<span style="color: #00A000">+ if (!member->avg_itt) member->avg_itt++;</span>
<span style="color: #00A000">+ member->avg_score = member->avg_tally / member->avg_itt;</span>
<span style="color: #00A000">+ }</span>
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG7,
<span style="color: #A00000">- "conf %s AGC %d %d %d %d %d %d\n", </span>
<span style="color: #00A000">+ "AGC %s:%d diff:%d level:%d cur:%d avg:%d vol:%d\n", </span>
member->conference->name,
member->id, member->conference->agc_level - member->avg_score, member->conference->agc_level,
member->score, member->avg_score, member->agc_volume_in_level);
<span style="color: #A00000">-</span>
<span style="color: #A00000">-</span>
if (++member->agc_concur >= agc_period) {
if (!member->vol_period) {
<span style="color: #800080; font-weight: bold">@@ -2223,6 +2230,9 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v</span>
}
}
}
<span style="color: #00A000">+</span>
<span style="color: #00A000">+</span>
<span style="color: #00A000">+ member->last_score = member->score;</span>
}
/* skip frames that are not actual media or when we are muted or silent */
<span style="color: #800080; font-weight: bold">@@ -3490,7 +3500,7 @@ static switch_status_t conf_api_sub_agc(conference_obj_t *conference, switch_str</span>
if (argc > 3) {
level = atoi(argv[3]);
} else {
<span style="color: #A00000">- level = 1200;</span>
<span style="color: #00A000">+ level = 1400;</span>
}
if (level > conference->energy_level) {
<span style="color: #800080; font-weight: bold">@@ -6444,7 +6454,7 @@ static conference_obj_t *conference_new(char *name, conf_xml_cfg_t cfg, switch_c</span>
int level = 0;
if (switch_true(auto_gain_level)) {
<span style="color: #A00000">- level = 1200;</span>
<span style="color: #00A000">+ level = 1400;</span>
} else {
level = atoi(auto_gain_level);
}
</pre></div>
========================================================================<pre>
Summary of changes:
.../applications/mod_conference/mod_conference.c | 30 +++++++++++++------
1 files changed, 20 insertions(+), 10 deletions(-)
</pre>
<p>this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email<br />
For more info, see <a href="http://blog.chomperstomp.com/?p=630">http://blog.chomperstomp.com/?p=630</a>
-- <br />
FreeSWITCH Source</p>