Skip to content

F
freeswitch
提交 4ca73d77 authored 作者: Anthony Minessale's avatar Anthony Minessale
浏览文件
操作

upgrade fax_detect to tone_detect 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5379 d0543943-73ff-0310-b7d9-9358b9ac24b2
上级 8f6e8d6e
显示空白字符变更
内嵌 并排
正在显示 包含 293 行增加 和 110 行删除
src/include/switch_ivr.h
浏览文件 @ 4ca73d77
...@@ -233,18 +233,27 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_stop_inband_dtmf_session(switch_core_ ...@@ -233,18 +233,27 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_stop_inband_dtmf_session(switch_core_
SWITCH_DECLARE(void) switch_ivr_session_echo(switch_core_session_t *session); SWITCH_DECLARE(void) switch_ivr_session_echo(switch_core_session_t *session);
/*! /*!
\brief Stop looking for FAX CNG \brief Stop looking for TONES
\param session the session to stop looking \param session the session to stop looking
\return SWITCH_STATUS_SUCCESS if all is well \return SWITCH_STATUS_SUCCESS if all is well
*/ */
SWITCH_DECLARE(switch_status_t) switch_ivr_stop_fax_detect_session(switch_core_session_t *session); SWITCH_DECLARE(switch_status_t) switch_ivr_stop_tone_detect_session(switch_core_session_t *session);
/*! /*!
\brief Start looking for FAX CNG \brief Start looking for TONES
\param session the session to start looking \param session the session to start looking
\return SWITCH_STATUS_SUCCESS if all is well \param key the name of the tone.
*/ \param tone_spec comma sep list of tone freqs
SWITCH_DECLARE(switch_status_t) switch_ivr_fax_detect_session(switch_core_session_t *session); \param flags one or both of 'r' and 'w'
\param timeout timeout
\param app optional application to execute when tone is found
\param data optional data for appliaction
\return SWITCH_STATUS_SUCCESS if all is well
*/
SWITCH_DECLARE(switch_status_t) switch_ivr_tone_detect_session(switch_core_session_t *session,
const char *key, const char *tone_spec,
const char *flags, time_t timeout,
const char *app, const char *data);
......
src/include/switch_types.h
浏览文件 @ 4ca73d77
...@@ -852,7 +852,7 @@ typedef enum { ...@@ -852,7 +852,7 @@ typedef enum {
SWITCH_EVENT_CODEC - Codec Change SWITCH_EVENT_CODEC - Codec Change
SWITCH_EVENT_BACKGROUND_JOB - Background Job SWITCH_EVENT_BACKGROUND_JOB - Background Job
SWITCH_EVENT_DETECTED_SPEECH - Detected Speech SWITCH_EVENT_DETECTED_SPEECH - Detected Speech
SWITCH_EVENT_DETECTED_FAX - Detected Fax CNG Tone SWITCH_EVENT_DETECTED_TONE - Detected Tone
SWITCH_EVENT_PRIVATE_COMMAND - A private command event SWITCH_EVENT_PRIVATE_COMMAND - A private command event
SWITCH_EVENT_HEARTBEAT - Machine is alive SWITCH_EVENT_HEARTBEAT - Machine is alive
SWITCH_EVENT_TRAP - Error Trap SWITCH_EVENT_TRAP - Error Trap
...@@ -902,7 +902,7 @@ typedef enum { ...@@ -902,7 +902,7 @@ typedef enum {
SWITCH_EVENT_CODEC, SWITCH_EVENT_CODEC,
SWITCH_EVENT_BACKGROUND_JOB, SWITCH_EVENT_BACKGROUND_JOB,
SWITCH_EVENT_DETECTED_SPEECH, SWITCH_EVENT_DETECTED_SPEECH,
SWITCH_EVENT_DETECTED_FAX, SWITCH_EVENT_DETECTED_TONE,
SWITCH_EVENT_PRIVATE_COMMAND, SWITCH_EVENT_PRIVATE_COMMAND,
SWITCH_EVENT_HEARTBEAT, SWITCH_EVENT_HEARTBEAT,
SWITCH_EVENT_TRAP, SWITCH_EVENT_TRAP,
......
src/mod/applications/mod_commands/mod_commands.c
浏览文件 @ 4ca73d77
...@@ -276,6 +276,51 @@ done: ...@@ -276,6 +276,51 @@ done:
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
SWITCH_STANDARD_API(tone_detect_session_function)
{
char *argv[6] = { 0 };
int argc;
char *mydata = NULL;
time_t to = 0;
switch_core_session_t *rsession;
mydata = switch_core_session_strdup(session, cmd);
if ((argc = switch_separate_string(mydata, ' ', argv, sizeof(argv) / sizeof(argv[0]))) < 3) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID ARGS!\n");
}
if (!(rsession = switch_core_session_locate(argv[0]))) {
stream->write_function(stream, "-Error Cannot locate session!\n");
return SWITCH_STATUS_SUCCESS;
}
if (argv[4]) {
uint32_t mto;
if (*argv[2] == '+') {
if ((mto = atoi(argv[3]+1)) > 0) {
to = time(NULL) + mto;
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID Timeout!\n");
goto done;
}
} else {
if ((to = atoi(argv[3])) < time(NULL)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID Timeout!\n");
to = 0;
goto done;
}
}
}
switch_ivr_tone_detect_session(rsession, argv[1], argv[2], argv[3], to, argv[5], argv[6]);
stream->write_function(stream, "Enabling tone detection '%s' '%s' '%s'\n", argv[1], argv[2], argv[3]);
done:
switch_core_session_rwunlock(rsession);
return SWITCH_STATUS_SUCCESS;
}
SWITCH_STANDARD_API(sched_transfer_function) SWITCH_STANDARD_API(sched_transfer_function)
{ {
...@@ -1385,13 +1430,22 @@ static switch_api_interface_t kill_api_interface = { ...@@ -1385,13 +1430,22 @@ static switch_api_interface_t kill_api_interface = {
/*.next */ &reload_api_interface /*.next */ &reload_api_interface
}; };
static switch_api_interface_t tone_detect_session_interface = {
/*.interface_name */ "tone_Detect",
/*.desc */ "Start Tone Detection on a channel",
/*.function */ tone_detect_session_function,
/*.syntax */
"<uuid> <key> <tone_spec> [<flags> <timeout> <app> <args>]",
/*.next */ &kill_api_interface
};
static switch_api_interface_t originate_api_interface = { static switch_api_interface_t originate_api_interface = {
/*.interface_name */ "originate", /*.interface_name */ "originate",
/*.desc */ "Originate a Call", /*.desc */ "Originate a Call",
/*.function */ originate_function, /*.function */ originate_function,
/*.syntax */ /*.syntax */
"<call url> <exten>|&<application_name>(<app_args>) [<dialplan>] [<context>] [<cid_name>] [<cid_num>] [<timeout_sec>]", "<call url> <exten>|&<application_name>(<app_args>) [<dialplan>] [<context>] [<cid_name>] [<cid_num>] [<timeout_sec>]",
/*.next */ &kill_api_interface /*.next */ &tone_detect_session_interface
}; };
static switch_loadable_module_interface_t commands_module_interface = { static switch_loadable_module_interface_t commands_module_interface = {
......
src/mod/applications/mod_dptools/mod_dptools.c
浏览文件 @ 4ca73d77
...@@ -664,20 +664,45 @@ static void stop_dtmf_session_function(switch_core_session_t *session, char *dat ...@@ -664,20 +664,45 @@ static void stop_dtmf_session_function(switch_core_session_t *session, char *dat
static void fax_detect_session_function(switch_core_session_t *session, char *data) static void fax_detect_session_function(switch_core_session_t *session, char *data)
{ {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Enabling fax detection\n"); switch_ivr_tone_detect_session(session, "fax", "1100.0", "r", 0, NULL, NULL);
switch_ivr_fax_detect_session(session);
} }
static void system_session_function(switch_core_session_t *session, char *data) static void tone_detect_session_function(switch_core_session_t *session, char *data)
{ {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Executing command: %s\n",data); char *argv[6] = { 0 };
system(data); int argc;
char *mydata = NULL;
time_t to = 0;
mydata = switch_core_session_strdup(session, data);
if ((argc = switch_separate_string(mydata, ' ', argv, sizeof(argv) / sizeof(argv[0]))) < 2) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID ARGS!\n");
}
if (argv[3]) {
uint32_t mto;
if (*argv[2] == '+') {
if ((mto = atoi(argv[2]+1)) > 0) {
to = time(NULL) + mto;
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID Timeout!\n");
}
} else {
if ((to = atoi(argv[2])) < time(NULL)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "INVALID Timeout!\n");
to = 0;
}
}
}
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Enabling tone detection '%s' '%s'\n", argv[0], argv[1]);
switch_ivr_tone_detect_session(session, argv[0], argv[1], argv[2], to, argv[4], argv[5]);
} }
static void stop_fax_detect_session_function(switch_core_session_t *session, char *data) static void stop_fax_detect_session_function(switch_core_session_t *session, char *data)
{ {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Disabling fax detection\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Disabling tone detection\n");
switch_ivr_stop_fax_detect_session(session); switch_ivr_stop_tone_detect_session(session);
} }
static void echo_function(switch_core_session_t *session, char *data) static void echo_function(switch_core_session_t *session, char *data)
...@@ -1018,15 +1043,6 @@ static switch_api_interface_t presence_api_interface = { ...@@ -1018,15 +1043,6 @@ static switch_api_interface_t presence_api_interface = {
/*.next */ &dptools_api_interface /*.next */ &dptools_api_interface
}; };
static switch_application_interface_t system_application_interface = {
/*.interface_name */ "system",
/*.application_function */ system_session_function,
/* long_desc */ "Execute a system command",
/* short_desc */ "Execute a system command",
/* syntax */ "<command>",
/* flags */ SAF_NONE,
/*.next */ NULL
};
static switch_application_interface_t bridge_application_interface = { static switch_application_interface_t bridge_application_interface = {
/*.interface_name */ "bridge", /*.interface_name */ "bridge",
...@@ -1034,8 +1050,7 @@ static switch_application_interface_t bridge_application_interface = { ...@@ -1034,8 +1050,7 @@ static switch_application_interface_t bridge_application_interface = {
/* long_desc */ "Bridge the audio between two sessions", /* long_desc */ "Bridge the audio between two sessions",
/* short_desc */ "Bridge Audio", /* short_desc */ "Bridge Audio",
/* syntax */ "<channel_url>", /* syntax */ "<channel_url>",
/* flags */ SAF_SUPPORT_NOMEDIA, /* flags */ SAF_SUPPORT_NOMEDIA
/* next */ &system_application_interface
}; };
static switch_application_interface_t speak_application_interface = { static switch_application_interface_t speak_application_interface = {
...@@ -1129,6 +1144,17 @@ static switch_application_interface_t echo_application_interface = { ...@@ -1129,6 +1144,17 @@ static switch_application_interface_t echo_application_interface = {
/*.next */ &park_application_interface /*.next */ &park_application_interface
}; };
static switch_application_interface_t tone_detect_application_interface = {
/*.interface_name */ "tone_detect",
/*.application_function */ tone_detect_session_function,
/* long_desc */ "Detect tones",
/* short_desc */ "Detect tones",
/* syntax */ "",
/* flags */ SAF_NONE,
/*.next */ &echo_application_interface
};
static switch_application_interface_t fax_detect_application_interface = { static switch_application_interface_t fax_detect_application_interface = {
/*.interface_name */ "fax_detect", /*.interface_name */ "fax_detect",
/*.application_function */ fax_detect_session_function, /*.application_function */ fax_detect_session_function,
...@@ -1136,14 +1162,14 @@ static switch_application_interface_t fax_detect_application_interface = { ...@@ -1136,14 +1162,14 @@ static switch_application_interface_t fax_detect_application_interface = {
/* short_desc */ "Detect faxes", /* short_desc */ "Detect faxes",
/* syntax */ "", /* syntax */ "",
/* flags */ SAF_NONE, /* flags */ SAF_NONE,
/*.next */ &echo_application_interface /*.next */ &tone_detect_application_interface
}; };
static switch_application_interface_t stop_fax_detect_application_interface = { static switch_application_interface_t stop_tone_detect_application_interface = {
/*.interface_name */ "stop_fax_detect", /*.interface_name */ "stop_tone_detect",
/*.application_function */ stop_fax_detect_session_function, /*.application_function */ stop_fax_detect_session_function,
/* long_desc */ "Stop detecting fax send tones", /* long_desc */ "Stop detecting tones",
/* short_desc */ "stop detecting faxes", /* short_desc */ "stop detecting tones",
/* syntax */ "", /* syntax */ "",
/* flags */ SAF_NONE, /* flags */ SAF_NONE,
/* next */ &fax_detect_application_interface /* next */ &fax_detect_application_interface
...@@ -1156,7 +1182,7 @@ static switch_application_interface_t dtmf_application_interface = { ...@@ -1156,7 +1182,7 @@ static switch_application_interface_t dtmf_application_interface = {
/* short_desc */ "Detect dtmf", /* short_desc */ "Detect dtmf",
/* syntax */ "", /* syntax */ "",
/* flags */ SAF_NONE, /* flags */ SAF_NONE,
/* next */ &stop_fax_detect_application_interface /* next */ &stop_tone_detect_application_interface
}; };
static switch_application_interface_t stop_dtmf_application_interface = { static switch_application_interface_t stop_dtmf_application_interface = {
......
src/switch_event.c
浏览文件 @ 4ca73d77
...@@ -133,7 +133,7 @@ static char *EVENT_NAMES[] = { ...@@ -133,7 +133,7 @@ static char *EVENT_NAMES[] = {
"CODEC", "CODEC",
"BACKGROUND_JOB", "BACKGROUND_JOB",
"DETECTED_SPEECH", "DETECTED_SPEECH",
"DETECTED_FAX", "DETECTED_TONE",
"PRIVATE_COMMAND", "PRIVATE_COMMAND",
"HEARTBEAT", "HEARTBEAT",
"TRAP", "TRAP",
......
src/switch_ivr_async.c
浏览文件 @ 4ca73d77
...@@ -138,18 +138,18 @@ static switch_bool_t displace_callback(switch_media_bug_t *bug, void *user_data, ...@@ -138,18 +138,18 @@ static switch_bool_t displace_callback(switch_media_bug_t *bug, void *user_data,
if (dh->mux) { if (dh->mux) {
int16_t buf[1024]; int16_t buf[1024];
int16_t *fp = frame->data; int16_t *fp = frame->data;
int x; uint32_t x;
switch_core_file_read(&dh->fh, buf, &len); switch_core_file_read(&dh->fh, buf, &len);
for(x = 0; x < len; x++) { for(x = 0; x < (uint32_t) len; x++) {
int32_t mixed = fp[x] + buf[x]; int32_t mixed = fp[x] + buf[x];
switch_normalize_to_16bit(mixed); switch_normalize_to_16bit(mixed);
fp[x] = (int16_t) mixed; fp[x] = (int16_t) mixed;
} }
} else { } else {
switch_core_file_read(&dh->fh, frame->data, &len); switch_core_file_read(&dh->fh, frame->data, &len);
frame->samples = len; frame->samples = (uint32_t) len;
frame->datalen = frame->samples * 2; frame->datalen = frame->samples * 2;
} }
switch_core_media_bug_set_write_replace_frame(bug, frame); switch_core_media_bug_set_write_replace_frame(bug, frame);
...@@ -477,45 +477,71 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_inband_dtmf_session(switch_core_sessi ...@@ -477,45 +477,71 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_inband_dtmf_session(switch_core_sessi
} }
#define MAX_TONES 16
typedef struct { typedef struct {
switch_core_session_t *session;
teletone_multi_tone_t mt; teletone_multi_tone_t mt;
} switch_fax_detect_t; char *app;
char *data;
char *key;
teletone_tone_map_t map;
int up;
} switch_tone_detect_t;
static switch_bool_t fax_detect_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type)
{
switch_fax_detect_t *pvt = (switch_fax_detect_t *) user_data;
uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE];
switch_frame_t frame = { 0 };
// switch_channel_t *channel = switch_core_session_get_channel(pvt->session);
// assert(channel != NULL); typedef struct {
frame.data = data; switch_tone_detect_t list[MAX_TONES+1];
frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE; int index;
switch_media_bug_t *bug;
switch_core_session_t *session;
} switch_tone_container_t;
static switch_bool_t tone_detect_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type)
{
switch_tone_container_t *cont = (switch_tone_container_t *) user_data;
switch_frame_t *frame = NULL;
int i = 0;
switch (type) { switch (type) {
case SWITCH_ABC_TYPE_INIT: case SWITCH_ABC_TYPE_INIT:
break; break;
case SWITCH_ABC_TYPE_CLOSE: case SWITCH_ABC_TYPE_CLOSE:
break; break;
case SWITCH_ABC_TYPE_READ: case SWITCH_ABC_TYPE_READ_REPLACE:
if (switch_core_media_bug_read(bug, &frame) == SWITCH_STATUS_SUCCESS) { frame = switch_core_media_bug_get_read_replace_frame(bug);
if(teletone_multi_tone_detect(&pvt->mt, frame.data, frame.samples)) { case SWITCH_ABC_TYPE_WRITE_REPLACE:
{
if (!frame) {
frame = switch_core_media_bug_get_write_replace_frame(bug);
}
for (i = 0 ; i < cont->index; cont++) {
if (cont->list[i].up && teletone_multi_tone_detect(&cont->list[i].mt, frame->data, frame->samples)) {
switch_event_t *event; switch_event_t *event;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FAX CNG DETECTED\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "TONE %s DETECTED\n", cont->list[i].key);
if (switch_event_create(&event, SWITCH_EVENT_DETECTED_FAX) == SWITCH_STATUS_SUCCESS) { if (cont->list[i].app) {
switch_event_t *dup; if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) {
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "call-command", "execute");
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "execute-app-name", "%s", cont->list[i].app);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "execute-app-arg", "%s", cont->list[i].data);
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5);
switch_core_session_queue_private_event(cont->session, &event);
}
}
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "fax", "detected"); cont->list[cont->index].up = 0;
if (switch_event_create(&event, SWITCH_EVENT_DETECTED_TONE) == SWITCH_STATUS_SUCCESS) {
switch_event_t *dup;
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Detected-Tone", "%s", cont->list[i].key);
if (switch_event_dup(&dup, event) == SWITCH_STATUS_SUCCESS) { if (switch_event_dup(&dup, event) == SWITCH_STATUS_SUCCESS) {
switch_event_fire(&dup); switch_event_fire(&dup);
} }
if (switch_core_session_queue_event(cont->session, &event) != SWITCH_STATUS_SUCCESS) {
if (switch_core_session_queue_event(pvt->session, &event) != SWITCH_STATUS_SUCCESS) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Event queue failed!\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Event queue failed!\n");
switch_event_add_header(event, SWITCH_STACK_BOTTOM, "delivery-failure", "true"); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "delivery-failure", "true");
switch_event_fire(&event); switch_event_fire(&event);
...@@ -523,6 +549,7 @@ static switch_bool_t fax_detect_callback(switch_media_bug_t *bug, void *user_dat ...@@ -523,6 +549,7 @@ static switch_bool_t fax_detect_callback(switch_media_bug_t *bug, void *user_dat
} }
} }
} }
}
break; break;
case SWITCH_ABC_TYPE_WRITE: case SWITCH_ABC_TYPE_WRITE:
default: default:
...@@ -531,15 +558,15 @@ static switch_bool_t fax_detect_callback(switch_media_bug_t *bug, void *user_dat ...@@ -531,15 +558,15 @@ static switch_bool_t fax_detect_callback(switch_media_bug_t *bug, void *user_dat
return SWITCH_TRUE; return SWITCH_TRUE;
} }
SWITCH_DECLARE(switch_status_t) switch_ivr_stop_fax_detect_session(switch_core_session_t *session) SWITCH_DECLARE(switch_status_t) switch_ivr_stop_tone_detect_session(switch_core_session_t *session)
{ {
switch_media_bug_t *bug;
switch_channel_t *channel = switch_core_session_get_channel(session); switch_channel_t *channel = switch_core_session_get_channel(session);
switch_tone_container_t *cont;
assert(channel != NULL); assert(channel != NULL);
if ((bug = switch_channel_get_private(channel, "fax"))) { if ((cont = switch_channel_get_private(channel, "_tone_detect_"))) {
switch_channel_set_private(channel, "fax", NULL); switch_channel_set_private(channel, "_tone_detect_", NULL);
switch_core_media_bug_remove(session, &bug); switch_core_media_bug_remove(session, &cont->bug);
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
...@@ -547,46 +574,113 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_stop_fax_detect_session(switch_core_s ...@@ -547,46 +574,113 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_stop_fax_detect_session(switch_core_s
} }
SWITCH_DECLARE(switch_status_t) switch_ivr_fax_detect_session(switch_core_session_t *session) SWITCH_DECLARE(switch_status_t) switch_ivr_tone_detect_session(switch_core_session_t *session,
const char *key, const char *tone_spec,
const char *flags, time_t timeout,
const char *app, const char *data)
{ {
switch_channel_t *channel; switch_channel_t *channel;
switch_codec_t *read_codec; switch_codec_t *read_codec;
switch_media_bug_t *bug;
switch_status_t status; switch_status_t status;
switch_fax_detect_t *pvt; switch_tone_container_t *cont = NULL;
teletone_tone_map_t *map; char *p, *next;
int i; int i = 0, ok = 0;
switch_media_bug_flag_t bflags = 0;
channel = switch_core_session_get_channel(session); channel = switch_core_session_get_channel(session);
assert(channel != NULL); assert(channel != NULL);
read_codec = switch_core_session_get_read_codec(session); read_codec = switch_core_session_get_read_codec(session);
assert(read_codec != NULL); assert(read_codec != NULL);
if (!(pvt = switch_core_session_alloc(session, sizeof(*pvt)))) { if (switch_strlen_zero(key)) {
return SWITCH_STATUS_MEMERR; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Key Specified!\n");
return SWITCH_STATUS_FALSE;
}
if ((cont = switch_channel_get_private(channel, "_tone_detect_"))) {
if (cont->index >= MAX_TONES) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Max Tones Reached!\n");
return SWITCH_STATUS_FALSE;
}
for(i = 0; i < cont->index; i++) {
if (!strcasecmp(key, cont->list[cont->index].key )) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Renabling %s\n", key);
cont->list[cont->index].up = 1;
teletone_multi_tone_init(&cont->list[i].mt, &cont->list[i].map);
return SWITCH_STATUS_SUCCESS;
}
}
}
if (switch_strlen_zero(tone_spec)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Spec Specified!\n");
return SWITCH_STATUS_FALSE;
} }
if (!(map = switch_core_session_alloc(session, sizeof(*map)))) { if (!cont && !(cont = switch_core_session_alloc(session, sizeof(*cont)))) {
return SWITCH_STATUS_MEMERR; return SWITCH_STATUS_MEMERR;
} }
for(i=0;i<TELETONE_MAX_TONES;i++) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Adding tone spec %s index %d\n", tone_spec, cont->index);
map->freqs[i] = 1100.0;
i = 0;
p = (char *) tone_spec;
do {
teletone_process_t this;
next = strchr(p, ',');
while(*p == ' ') p++;
if ((this = (teletone_process_t) atof(p))) {
ok++;
cont->list[cont->index].map.freqs[i++] = this;
} }
pvt->mt.sample_rate = read_codec->implementation->samples_per_second; if (next) {
pvt->session = session; p = next + 1;
}
} while (next);
teletone_multi_tone_init(&pvt->mt, map); if (!ok) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid tone spec!\n");
return SWITCH_STATUS_FALSE;
}
cont->list[cont->index].key = switch_core_session_strdup(session, key);
if (app) {
cont->list[cont->index].app = switch_core_session_strdup(session, app);
}
if (data) {
cont->list[cont->index].data = switch_core_session_strdup(session, data);
}
cont->list[cont->index].up = 1;
cont->list[cont->index].mt.sample_rate = read_codec->implementation->samples_per_second;
teletone_multi_tone_init(&cont->list[cont->index].mt, &cont->list[cont->index].map);
cont->session = session;
switch_channel_answer(channel); switch_channel_answer(channel);
if ((status = switch_core_media_bug_add(session, fax_detect_callback, pvt, 0, SMBF_READ_STREAM, &bug)) != SWITCH_STATUS_SUCCESS) { if (switch_strlen_zero(flags)) {
bflags = SMBF_READ_REPLACE;
} else {
if (strchr(flags, 'r')) {
bflags |= SMBF_READ_REPLACE;
} else if (strchr(flags, 'w')) {
bflags |= SMBF_WRITE_REPLACE;
}
}
if ((status = switch_core_media_bug_add(session, tone_detect_callback, cont, timeout, bflags, &cont->bug)) != SWITCH_STATUS_SUCCESS) {
return status; return status;
} }
switch_channel_set_private(channel, "fax", bug); switch_channel_set_private(channel, "_tone_detect_", cont);
cont->index++;
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论