mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-04-14 16:15:04 +00:00
tweak agc
This commit is contained in:
parent
5e6123ef5f
commit
b8531ea873
@ -266,6 +266,7 @@ typedef struct conference_obj {
|
||||
switch_thread_rwlock_t *rwlock;
|
||||
uint32_t count;
|
||||
int32_t energy_level;
|
||||
int32_t agc_energy_level;
|
||||
uint8_t min;
|
||||
switch_speech_handle_t lsh;
|
||||
switch_speech_handle_t *sh;
|
||||
@ -326,6 +327,7 @@ struct conference_member {
|
||||
uint32_t frame_size;
|
||||
uint8_t *mux_frame;
|
||||
uint32_t read;
|
||||
uint32_t vol_period;
|
||||
int32_t energy_level;
|
||||
int32_t agc_volume_in_level;
|
||||
int32_t volume_in_level;
|
||||
@ -345,7 +347,7 @@ struct conference_member {
|
||||
uint32_t verbose_events;
|
||||
uint32_t avg_score;
|
||||
uint32_t avg_itt;
|
||||
uint32_t avg_tally;
|
||||
uint32_t avg_tally;
|
||||
struct conference_member *next;
|
||||
switch_ivr_dmachine_t *dmachine;
|
||||
};
|
||||
@ -1940,6 +1942,17 @@ static void conference_loop_fn_hangup(conference_member_t *member, caller_contro
|
||||
switch_clear_flag_locked(member, MFLAG_RUNNING);
|
||||
}
|
||||
|
||||
static void clear_avg(conference_member_t *member)
|
||||
{
|
||||
|
||||
member->agc_volume_in_level = 0;
|
||||
member->avg_score = 0;
|
||||
member->avg_itt = 0;
|
||||
member->avg_tally = 0;
|
||||
member->nt_tally = 0;
|
||||
}
|
||||
|
||||
|
||||
/* marshall frames from the call leg to the conference thread for muxing to other call legs */
|
||||
static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, void *obj)
|
||||
{
|
||||
@ -1948,7 +1961,7 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
|
||||
switch_channel_t *channel;
|
||||
switch_status_t status;
|
||||
switch_frame_t *read_frame = NULL;
|
||||
uint32_t hangover = 40, hangunder = 15, hangover_hits = 0, hangunder_hits = 0, energy_level = 0, diff_level = 400;
|
||||
uint32_t hangover = 40, hangunder = 5, hangover_hits = 0, hangunder_hits = 0, energy_level = 0, diff_level = 400;
|
||||
switch_codec_implementation_t read_impl = { 0 };
|
||||
switch_core_session_t *session = member->session;
|
||||
int check_floor_change;
|
||||
@ -1991,6 +2004,7 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
|
||||
if (++hangover_hits >= hangover) {
|
||||
hangover_hits = hangunder_hits = 0;
|
||||
switch_clear_flag_locked(member, MFLAG_TALKING);
|
||||
clear_avg(member);
|
||||
|
||||
if (test_eflag(member->conference, EFLAG_STOP_TALKING) &&
|
||||
switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
|
||||
@ -2006,19 +2020,9 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
|
||||
|
||||
/* Check for input volume adjustments */
|
||||
if (!member->conference->agc_level) {
|
||||
member->agc_volume_in_level = 0;
|
||||
member->avg_score = 0;
|
||||
member->avg_itt = 0;
|
||||
member->avg_tally = 0;
|
||||
}
|
||||
|
||||
if (member->conference->agc_level && member->agc_volume_in_level) {
|
||||
switch_change_sln_volume(read_frame->data, read_frame->datalen / 2, member->agc_volume_in_level);
|
||||
} else if (member->volume_in_level) {
|
||||
switch_change_sln_volume(read_frame->data, read_frame->datalen / 2, member->volume_in_level);
|
||||
clear_avg(member);
|
||||
}
|
||||
|
||||
|
||||
energy_level = member->energy_level;
|
||||
|
||||
/* if the member can speak, compute the audio energy level and */
|
||||
@ -2027,7 +2031,8 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
|
||||
uint32_t energy = 0, i = 0, samples = 0, j = 0;
|
||||
int16_t *data;
|
||||
int divisor = 0;
|
||||
int one_sec = (read_impl.actual_samples_per_second / read_impl.samples_per_packet);
|
||||
int agc_period = (read_impl.actual_samples_per_second / read_impl.samples_per_packet) / 2;
|
||||
int combined_vol = 0;
|
||||
|
||||
data = read_frame->data;
|
||||
|
||||
@ -2037,77 +2042,62 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
|
||||
|
||||
member->score = 0;
|
||||
|
||||
combined_vol = member->agc_volume_in_level;
|
||||
if (member->conference->agc_level) {
|
||||
combined_vol += member->agc_volume_in_level;
|
||||
}
|
||||
|
||||
if (combined_vol) {
|
||||
switch_change_sln_volume(read_frame->data, read_frame->datalen / 2, combined_vol);
|
||||
}
|
||||
|
||||
if ((samples = read_frame->datalen / sizeof(*data))) {
|
||||
for (i = 0; i < samples; i++) {
|
||||
energy += abs(data[j]);
|
||||
j += read_impl.number_of_channels;
|
||||
}
|
||||
member->score = energy / (samples / divisor);
|
||||
member->avg_tally += member->score;
|
||||
member->avg_score = member->avg_tally / ++member->avg_itt;
|
||||
if (!member->avg_itt) member->avg_tally = member->score;
|
||||
}
|
||||
|
||||
if (member->vol_period) {
|
||||
member->vol_period--;
|
||||
}
|
||||
|
||||
if (member->conference->agc_level && member->score &&
|
||||
switch_test_flag(member, MFLAG_TALKING) &&
|
||||
switch_test_flag(member, MFLAG_CAN_SPEAK) &&
|
||||
member->score > member->energy_level
|
||||
member->score > member->conference->agc_energy_level
|
||||
) {
|
||||
int diff = member->conference->agc_level - member->score;
|
||||
|
||||
if (abs(diff) >= 200) {
|
||||
member->agc_concur++;
|
||||
} else {
|
||||
member->agc_concur = 0;
|
||||
}
|
||||
|
||||
#if 0
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG8,
|
||||
"conf %s FOO %d %d %d %d %d\n",
|
||||
member->conference->name,
|
||||
member->id, diff, member->conference->agc_level,
|
||||
member->score, member->agc_volume_in_level);
|
||||
#endif
|
||||
member->avg_tally += member->score;
|
||||
member->avg_itt++;
|
||||
if (!member->avg_itt) member->avg_itt++;
|
||||
member->avg_score = member->avg_tally / member->avg_itt;
|
||||
|
||||
if (member->agc_concur >= one_sec) {
|
||||
if (member->score < member->conference->agc_level) {
|
||||
member->agc_volume_in_level++;
|
||||
|
||||
switch_normalize_volume(member->agc_volume_in_level);
|
||||
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG7,
|
||||
"conf %s AGC +++ %d %d %d %d %d\n",
|
||||
member->conference->name,
|
||||
member->id, diff, member->conference->agc_level,
|
||||
member->score, member->agc_volume_in_level);
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG7,
|
||||
"conf %s AGC %d %d %d %d %d %d\n",
|
||||
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);
|
||||
|
||||
} else {
|
||||
member->agc_volume_in_level--;
|
||||
|
||||
switch_normalize_volume(member->agc_volume_in_level);
|
||||
|
||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG7,
|
||||
"conf %s AGC --- %d %d %d %d %d\n",
|
||||
member->conference->name,
|
||||
member->id, diff, member->conference->agc_level,
|
||||
member->score, member->agc_volume_in_level);
|
||||
|
||||
if (++member->nt_tally >= agc_period) {
|
||||
if (!member->vol_period) {
|
||||
if (member->avg_score < member->conference->agc_level) {
|
||||
member->agc_volume_in_level++;
|
||||
switch_normalize_volume(member->agc_volume_in_level);
|
||||
member->vol_period = (read_impl.actual_samples_per_second / read_impl.samples_per_packet) * 2;
|
||||
}
|
||||
|
||||
if (member->avg_score > member->conference->agc_level) {
|
||||
member->agc_volume_in_level--;
|
||||
switch_normalize_volume(member->agc_volume_in_level);
|
||||
member->vol_period = (read_impl.actual_samples_per_second / read_impl.samples_per_packet) * 2;
|
||||
}
|
||||
}
|
||||
member->agc_concur = 0;
|
||||
}
|
||||
member->nt_tally = 0;
|
||||
} else {
|
||||
member->nt_tally++;
|
||||
member->agc_concur = 0;
|
||||
|
||||
if (member->nt_tally > one_sec * 5) {
|
||||
member->agc_volume_in_level = 0;
|
||||
member->nt_tally = 0;
|
||||
member->avg_itt = 0;
|
||||
member->avg_tally = 0;
|
||||
member->avg_score = member->score;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
member->score_iir = (int) (((1.0 - SCORE_DECAY) * (float) member->score) + (SCORE_DECAY * (float) member->score_iir));
|
||||
@ -2162,6 +2152,7 @@ static void *SWITCH_THREAD_FUNC conference_loop_input(switch_thread_t *thread, v
|
||||
if (++hangover_hits >= hangover) {
|
||||
hangover_hits = hangunder_hits = 0;
|
||||
switch_clear_flag_locked(member, MFLAG_TALKING);
|
||||
clear_avg(member);
|
||||
|
||||
if (test_eflag(member->conference, EFLAG_STOP_TALKING) &&
|
||||
switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, CONF_EVENT_MAINT) == SWITCH_STATUS_SUCCESS) {
|
||||
@ -3421,7 +3412,7 @@ static switch_status_t conf_api_sub_mute(conference_member_t *member, switch_str
|
||||
|
||||
static switch_status_t conf_api_sub_agc(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv)
|
||||
{
|
||||
int level;
|
||||
int level, energy_level;
|
||||
int on = 0;
|
||||
|
||||
if (argc == 2) {
|
||||
@ -3439,7 +3430,13 @@ static switch_status_t conf_api_sub_agc(conference_obj_t *conference, switch_str
|
||||
if (argc > 3) {
|
||||
level = atoi(argv[3]);
|
||||
} else {
|
||||
level = 2000;
|
||||
level = 650;
|
||||
}
|
||||
|
||||
if (argc > 4) {
|
||||
energy_level = atoi(argv[4]);
|
||||
} else {
|
||||
energy_level = 100;
|
||||
}
|
||||
|
||||
if (level > conference->energy_level) {
|
||||
@ -3447,9 +3444,10 @@ static switch_status_t conf_api_sub_agc(conference_obj_t *conference, switch_str
|
||||
conference->avg_itt = 0;
|
||||
conference->avg_tally = 0;
|
||||
conference->agc_level = level;
|
||||
|
||||
conference->agc_energy_level = energy_level;
|
||||
|
||||
if (stream) {
|
||||
stream->write_function(stream, "OK AGC ENABLED %d\n", conference->agc_level);
|
||||
stream->write_function(stream, "OK AGC ENABLED %d %d\n", conference->agc_level, conference->agc_energy_level);
|
||||
}
|
||||
|
||||
} else {
|
||||
@ -3823,7 +3821,7 @@ static void conference_xlist(conference_obj_t *conference, switch_xml_t x_confer
|
||||
|
||||
if (conference->agc_level) {
|
||||
char tmp[30] = "";
|
||||
switch_snprintf(tmp, sizeof(tmp), "%d", conference->agc_level);
|
||||
switch_snprintf(tmp, sizeof(tmp), "%d:%d", conference->agc_level, conference->agc_energy_level);
|
||||
switch_xml_set_attr_d_buf(x_conference, "agc", tmp);
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user