kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[core] play_and_collect_input() - suppress digit timer if start of speech is detected

This commit is contained in:
Kevin Garabedian 2021-10-14 15:56:54 -04:00 committed by Andrey Volk
parent e9fde845de
commit f8d8e740cc
1 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/switch_ivr_play_say.c
View File

@ -3191,6 +3191,7 @@ typedef struct {
const char *terminators; const char *terminators;
char terminator; char terminator;
switch_time_t last_digit_time; switch_time_t last_digit_time;
switch_bool_t is_speech;
} switch_collect_input_state_t; } switch_collect_input_state_t;
static switch_status_t switch_collect_input_callback(switch_core_session_t *session, void *input, switch_input_type_t input_type, void *data, unsigned int len) static switch_status_t switch_collect_input_callback(switch_core_session_t *session, void *input, switch_input_type_t input_type, void *data, unsigned int len)
@ -3239,18 +3240,21 @@ static switch_status_t switch_collect_input_callback(switch_core_session_t *sess
if (!strcasecmp(speech_type, "begin-speaking")) { if (!strcasecmp(speech_type, "begin-speaking")) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "(%s) START OF SPEECH\n", switch_channel_get_name(channel)); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "(%s) START OF SPEECH\n", switch_channel_get_name(channel));
state->is_speech = SWITCH_TRUE;
if (switch_test_flag(state, SWITCH_COLLECT_INPUT_PROMPT)) { if (switch_test_flag(state, SWITCH_COLLECT_INPUT_PROMPT)) {
/* barge in on prompt */ /* barge in on prompt */
return SWITCH_STATUS_BREAK; return SWITCH_STATUS_BREAK;
} }
} }
} }
if (switch_test_flag(state, SWITCH_COLLECT_INPUT_DIGITS) && input_type == SWITCH_INPUT_TYPE_DTMF) { if (switch_test_flag(state, SWITCH_COLLECT_INPUT_DIGITS) && input_type == SWITCH_INPUT_TYPE_DTMF) {
switch_dtmf_t *dtmf = (switch_dtmf_t *) input; switch_dtmf_t *dtmf = (switch_dtmf_t *) input;
state->last_digit_time = switch_micro_time_now(); state->last_digit_time = switch_micro_time_now();
state->is_speech = SWITCH_FALSE;
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "\nis_speech = false; SWITCH_INPUT_TYPE_DTMF; last_digit_time=%lu\n", state->last_digit_time);
if (!zstr(state->terminators) && strchr(state->terminators, dtmf->digit)) { if (!zstr(state->terminators) && strchr(state->terminators, dtmf->digit)) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "(%s) ACCEPT TERMINATOR %c\n", switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "(%s) ACCEPT TERMINATOR %c\n",
@ -3426,18 +3430,27 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_and_collect_input(switch_core_se
continue; continue;
} }
sleep_time = (switch_micro_time_now() - state.last_digit_time) / 1000; if (state.is_speech == SWITCH_FALSE) {
if (sleep_time >= digit_timeout) {
// too much time since last digit // calculating how much time has elapsed since the last digit was collected
if (!switch_test_flag(&state, SWITCH_COLLECT_INPUT_DIGITS_DONE)) { sleep_time = (switch_micro_time_now() - state.last_digit_time) / 1000;
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "(%s) INTER-DIGIT TIMEOUT\n", switch_channel_get_name(channel));
switch_set_flag(&state, SWITCH_COLLECT_INPUT_DIGITS_DONE); if (sleep_time >= digit_timeout) {
// too much time since last digit
if (!switch_test_flag(&state, SWITCH_COLLECT_INPUT_DIGITS_DONE)) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, " (%s) INTER-DIGIT TIMEOUT is_speech = false; sleep_time >= digit_timeout; sleep_time=%i; last_digit_time=%lu; digit_timeout=%lu \n", switch_channel_get_name(channel), sleep_time, state.last_digit_time, (unsigned long)digit_timeout);
switch_set_flag(&state, SWITCH_COLLECT_INPUT_DIGITS_DONE);
} else {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "\nis_speech = false; sleep_time >= digit_timeout; sleep_time=%i; last_digit_time=%lu; digit_timeout=%lu \n", sleep_time, state.last_digit_time, (unsigned long)digit_timeout);
}
status = SWITCH_STATUS_SUCCESS;
sleep_time = digit_timeout;
} else {
// woke up early, sleep for remaining digit timeout
sleep_time = digit_timeout - sleep_time;
} }
status = SWITCH_STATUS_SUCCESS;
sleep_time = digit_timeout;
} else { } else {
// woke up early, sleep for remaining digit timeout switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "\nis_speech = true; sleep_time < digit_timeout; sleep_time=%i; last_digit_time=%lu; digit_timeout=%lu \n", sleep_time, state.last_digit_time, (unsigned long)digit_timeout);
sleep_time = digit_timeout - sleep_time;
} }
if (status != SWITCH_STATUS_BREAK && status != SWITCH_STATUS_SUCCESS) { if (status != SWITCH_STATUS_BREAK && status != SWITCH_STATUS_SUCCESS) {