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

add hits to tone_detect 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@10454 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2008-11-19 02:40:59 +00:00
parent a8a66e9157
commit 1a179a676e
1 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/switch_ivr_async.c
View File

@ -1195,7 +1195,7 @@ typedef struct {
int total_hits;
int hits;
int sleep;
time_t expires;
int expires;
} switch_tone_detect_t;
typedef struct {
@ -1217,35 +1217,48 @@ static switch_bool_t tone_detect_callback(switch_media_bug_t *bug, void *user_da
case SWITCH_ABC_TYPE_CLOSE:
break;
case SWITCH_ABC_TYPE_READ_REPLACE:
frame = switch_core_media_bug_get_read_replace_frame(bug);
case SWITCH_ABC_TYPE_WRITE_REPLACE:
{
int skip = 0;
if (!frame) {
if (type == SWITCH_ABC_TYPE_READ_REPLACE) {
frame = switch_core_media_bug_get_read_replace_frame(bug);
} else {
frame = switch_core_media_bug_get_write_replace_frame(bug);
}
for (i = 0; i < cont->index; i++) {
if (cont->list[i].expires && cont->list[i].expires < switch_timestamp(NULL)) {
cont->list[i].hits = 0;
cont->list[i].sleep = 0;
cont->list[i].expires = 0;
}
if (cont->list[i].sleep) {
cont->list[i].sleep--;
return SWITCH_TRUE;
if (cont->list[i].sleep) {
skip = 1;
}
}
if (cont->list[i].up && teletone_multi_tone_detect(&cont->list[i].mt, frame->data, frame->samples)) {
if (cont->list[i].expires) {
cont->list[i].expires--;
if (!cont->list[i].expires) {
cont->list[i].hits = 0;
cont->list[i].sleep = 0;
cont->list[i].expires = 0;
}
}
if (!cont->list[i].up) skip = 1;
if (skip) return SWITCH_TRUE;
if (teletone_multi_tone_detect(&cont->list[i].mt, frame->data, frame->samples)) {
switch_event_t *event;
cont->list[i].hits++;
cont->list[i].up = cont->list[i].hits++;
cont->list[i].sleep = 25;
cont->list[i].expires = switch_timestamp(NULL) + 5;
teletone_multi_tone_init(&cont->list[i].mt, &cont->list[i].map);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "TONE %s HIT %d/%d\n",
cont->list[i].key, cont->list[i].up, cont->list[i].hits);
cont->list[i].key, cont->list[i].hits, cont->list[i].total_hits);
cont->list[i].sleep = 50;
cont->list[i].expires = 250;
if (cont->list[i].hits >= cont->list[i].total_hits) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "TONE %s DETECTED\n", cont->list[i].key);
@ -1332,7 +1345,6 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_tone_detect_session(switch_core_sessi
cont->list[i].hits = 0;
cont->list[i].sleep = 0;
cont->list[i].expires = 0;
teletone_multi_tone_init(&cont->list[i].mt, &cont->list[i].map);
return SWITCH_STATUS_SUCCESS;
}
}