August 2007 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r5664 - in freeswitch/trunk/src: . include mod/applications/mod_conference mod/applications/mod_rss mod/languages/mod_spidermonkey
by Freeswitch SVN 25 Aug '07

25 Aug '07

Author: anthm Date: Sat Aug 25 17:33:26 2007 New Revision: 5664 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h freeswitch/trunk/src/switch_core_directory.c freeswitch/trunk/src/switch_core_speech.c freeswitch/trunk/src/switch_ivr_play_say.c Log: change javascript and confernece to use cached speech handles This is for better performace and to take atvantage of mrcp connections. There should be no apparent change in usage. The conference now supports changing the voice via the text string by starting a text blurb with #voice# eg #william#This will sound like William. Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Sat Aug 25 17:33:26 2007 @@ -1173,13 +1173,17 @@ \param module_name the speech module to use \param voice_name the desired voice name \param rate the sampling rate + \param interval the sampling interval \param flags tts flags \param pool the pool to use (NULL for new pool) \return SWITCH_STATUS_SUCCESS if the handle is opened */ SWITCH_DECLARE(switch_status_t) switch_core_speech_open(switch_speech_handle_t *sh, char *module_name, - char *voice_name, unsigned int rate, switch_speech_flag_t *flags, switch_memory_pool_t *pool); + char *voice_name, + unsigned int rate, + unsigned int interval, + switch_speech_flag_t *flags, switch_memory_pool_t *pool); /*! \brief Feed text to the TTS module \param sh the speech handle to feed Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Sat Aug 25 17:33:26 2007 @@ -155,7 +155,7 @@ typedef struct conference_file_node { switch_file_handle_t fh; - switch_speech_handle_t sh; + switch_speech_handle_t *sh; node_type_t type; uint8_t done; uint8_t async; @@ -218,6 +218,8 @@ uint32_t count; int32_t energy_level; uint8_t min; + switch_speech_handle_t lsh; + switch_speech_handle_t *sh; } conference_obj_t; /* Relationship with another member */ @@ -257,6 +259,8 @@ conference_file_node_t *fnode; conference_relationship_t *relationships; switch_ivr_digit_stream_t *digit_stream; + switch_speech_handle_t lsh; + switch_speech_handle_t *sh; struct conference_member *next; }; @@ -607,8 +611,8 @@ fnode = fnode->next; if (cur->type == NODE_TYPE_SPEECH) { - switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - switch_core_speech_close(&cur->sh, &flags); + //switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; + //switch_core_speech_close(&cur->sh, &flags); } else { switch_core_file_close(&cur->fh); } @@ -618,6 +622,12 @@ } } + if (member->sh) { + switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; + switch_core_speech_close(member->sh, &flags); + member->sh = NULL; + } + member->conference = NULL; if (!switch_test_flag(member, MFLAG_NOCHANNEL)) { @@ -763,7 +773,7 @@ switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_BLOCKING; uint32_t rate = conference->rate; - if (switch_core_speech_read_tts(&conference->fnode->sh, file_frame, &file_data_len, &rate, &flags) == SWITCH_STATUS_SUCCESS) { + if (switch_core_speech_read_tts(conference->fnode->sh, file_frame, &file_data_len, &rate, &flags) == SWITCH_STATUS_SUCCESS) { file_sample_len = file_data_len / 2; } else { file_sample_len = file_data_len = 0; @@ -897,8 +907,8 @@ switch_memory_pool_t *pool; if (conference->fnode->type == NODE_TYPE_SPEECH) { - switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - switch_core_speech_close(&conference->fnode->sh, &flags); + //switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; + //switch_core_speech_close(conference->fnode->sh, &flags); } else { switch_core_file_close(&conference->fnode->fh); } @@ -943,8 +953,8 @@ fnode = fnode->next; if (cur->type == NODE_TYPE_SPEECH) { - switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - switch_core_speech_close(&cur->sh, &flags); + //switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; + //switch_core_speech_close(&cur->sh, &flags); } else { switch_core_file_close(&cur->fh); } @@ -991,6 +1001,12 @@ switch_ivr_digit_stream_parser_destroy(conference->dtmf_parser); + if (conference->sh) { + switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; + switch_core_speech_close(conference->sh, &flags); + conference->sh = NULL; + } + if (conference->pool) { switch_memory_pool_t *pool = conference->pool; switch_core_destroy_memory_pool(&pool); @@ -1658,8 +1674,8 @@ switch_memory_pool_t *pool; if (member->fnode->type == NODE_TYPE_SPEECH) { - switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; - switch_core_speech_close(&member->fnode->sh, &flags); + //switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; + //switch_core_speech_close(&member->fnode->sh, &flags); } else { switch_core_file_close(&member->fnode->fh); } @@ -1680,7 +1696,7 @@ switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_BLOCKING; uint32_t rate = member->conference->rate; - if (switch_core_speech_read_tts(&member->fnode->sh, file_frame, &file_data_len, &rate, &flags) == SWITCH_STATUS_SUCCESS) { + if (switch_core_speech_read_tts(member->fnode->sh, file_frame, &file_data_len, &rate, &flags) == SWITCH_STATUS_SUCCESS) { file_sample_len = file_data_len / 2; } else { file_sample_len = file_data_len = 0; @@ -2238,11 +2254,15 @@ fnode->leadin = leadin; fnode->pool = pool; - memset(&fnode->sh, 0, sizeof(fnode->sh)); - if (switch_core_speech_open(&fnode->sh, conference->tts_engine, conference->tts_voice, conference->rate, &flags, fnode->pool) != - SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module [%s]!\n", conference->tts_engine); - return SWITCH_STATUS_FALSE; + if (!member->sh) { + memset(&member->lsh, 0, sizeof(member->lsh)); + if (switch_core_speech_open(&member->lsh, conference->tts_engine, conference->tts_voice, + conference->rate, conference->interval, &flags, fnode->pool) != + SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module [%s]!\n", conference->tts_engine); + return SWITCH_STATUS_FALSE; + } + member->sh = &member->lsh; } /* Queue the node */ @@ -2254,10 +2274,24 @@ } else { member->fnode = fnode; } - + + fnode->sh = member->sh; /* Begin Generation */ switch_sleep(200000); - switch_core_speech_feed_tts(&fnode->sh, text, &flags); + + if (*text == '#') { + char *tmp = (char *)text + 1; + char *vp = tmp, voice[128] = ""; + if ((tmp = strchr(tmp, '#'))) { + text = tmp + 1; + switch_copy_string(voice, vp, (tmp - vp) + 1); + switch_core_speech_text_param_tts(fnode->sh, "voice", voice); + } + } else { + switch_core_speech_text_param_tts(fnode->sh, "voice", conference->tts_voice); + } + + switch_core_speech_feed_tts(fnode->sh, text, &flags); switch_mutex_unlock(member->flag_mutex); status = SWITCH_STATUS_SUCCESS; @@ -2309,12 +2343,16 @@ fnode->type = NODE_TYPE_SPEECH; fnode->leadin = leadin; - - memset(&fnode->sh, 0, sizeof(fnode->sh)); - if (switch_core_speech_open(&fnode->sh, conference->tts_engine, conference->tts_voice, conference->rate, &flags, conference->pool) != - SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module [%s]!\n", conference->tts_engine); - return SWITCH_STATUS_FALSE; + + if (!conference->sh) { + memset(&conference->lsh, 0, sizeof(conference->lsh)); + if (switch_core_speech_open(&conference->lsh, conference->tts_engine, conference->tts_voice, + conference->rate, conference->interval, &flags, conference->pool) != + SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module [%s]!\n", conference->tts_engine); + return SWITCH_STATUS_FALSE; + } + conference->sh = &conference->lsh; } fnode->pool = pool; @@ -2329,9 +2367,22 @@ conference->fnode = fnode; } + fnode->sh = conference->sh; + if (*text == '#') { + char *tmp = (char *)text + 1; + char *vp = tmp, voice[128] = ""; + if ((tmp = strchr(tmp, '#'))) { + text = tmp + 1; + switch_copy_string(voice, vp, (tmp - vp) + 1); + switch_core_speech_text_param_tts(fnode->sh, "voice", voice); + } + } else { + switch_core_speech_text_param_tts(fnode->sh, "voice", conference->tts_voice); + } + /* Begin Generation */ switch_sleep(200000); - switch_core_speech_feed_tts(&fnode->sh, (char *) text, &flags); + switch_core_speech_feed_tts(fnode->sh, (char *) text, &flags); switch_mutex_unlock(conference->mutex); status = SWITCH_STATUS_SUCCESS; Modified: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c (original) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Sat Aug 25 17:33:26 2007 @@ -243,7 +243,7 @@ } memset(&sh, 0, sizeof(sh)); - if (switch_core_speech_open(&sh, engine, voice, rate, &flags, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { + if (switch_core_speech_open(&sh, engine, voice, rate, interval, &flags, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module!\n"); return; } Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Sat Aug 25 17:33:26 2007 @@ -1506,6 +1506,53 @@ return JS_TRUE; } +static void destroy_speech_engine(struct js_session *jss) +{ + if (jss->speech) { + switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; + switch_core_codec_destroy(&jss->speech->codec); + switch_core_speech_close(&jss->speech->sh, &flags); + jss->speech = NULL; + } +} + + +static switch_status_t init_speech_engine(struct js_session *jss, char *engine, char *voice) +{ + switch_codec_t *read_codec; + switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_NONE; + uint32_t rate = 0; + int interval = 0; + + read_codec = switch_core_session_get_read_codec(jss->session); + rate = read_codec->implementation->samples_per_second; + interval = read_codec->implementation->microseconds_per_frame / 1000; + + if (switch_core_codec_init(&jss->speech->codec, + "L16", + NULL, + rate, + interval, + 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, + switch_core_session_get_pool(jss->session)) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16@%uhz 1 channel %dms\n", rate, interval); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n", rate, interval); + return SWITCH_STATUS_FALSE; + } + + + if (switch_core_speech_open(&jss->speech->sh, engine, voice, rate, interval, + &flags, switch_core_session_get_pool(jss->session)) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module!\n"); + switch_core_codec_destroy(&jss->speech->codec); + return SWITCH_STATUS_FALSE; + } + + return SWITCH_STATUS_SUCCESS; + +} + static JSBool session_speak(JSContext * cx, JSObject * obj, uintN argc, jsval * argv, jsval * rval) { @@ -1524,13 +1571,13 @@ METHOD_SANITY_CHECK(); + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); channel = switch_core_session_get_channel(jss->session); assert(channel != NULL); CHANNEL_SANITY_CHECK(); if (argc < 3) { - *rval = BOOLEAN_TO_JSVAL(JS_FALSE); return JS_FALSE; } @@ -1538,6 +1585,34 @@ voice_name = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); text = JS_GetStringBytes(JS_ValueToString(cx, argv[2])); + + if (switch_strlen_zero(tts_name)) { + eval_some_js("~throw new Error(\"Invalid TTS Name\");", cx, obj, rval); + return JS_TRUE; + } + + if (switch_strlen_zero(text)) { + eval_some_js("~throw new Error(\"Invalid Text\");", cx, obj, rval); + return JS_TRUE; + } + + + if (jss->speech && strcasecmp(jss->speech->sh.name, tts_name)) { + destroy_speech_engine(jss); + } + + if (jss->speech) { + switch_core_speech_text_param_tts(&jss->speech->sh, "voice", voice_name); + } else { + jss->speech = switch_core_session_alloc(jss->session, sizeof(*jss->speech)); + assert(jss->speech != NULL); + if (init_speech_engine(jss, tts_name, voice_name) != SWITCH_STATUS_SUCCESS) { + eval_some_js("~throw new Error(\"Cannot allocate speech engine!\");", cx, obj, rval); + jss->speech = NULL; + return JS_TRUE; + } + } + if (argc > 3) { if ((function = JS_ValueToFunction(cx, argv[3]))) { memset(&cb_state, 0, sizeof(cb_state)); @@ -1555,9 +1630,6 @@ } } - if (!tts_name && text) { - return JS_FALSE; - } codec = switch_core_session_get_read_codec(jss->session); cb_state.ret = BOOLEAN_TO_JSVAL(JS_FALSE); @@ -1565,8 +1637,9 @@ args.input_callback = dtmf_func; args.buf = bp; args.buflen = len; - switch_ivr_speak_text(jss->session, tts_name, voice_name - && strlen(voice_name) ? voice_name : NULL, codec->implementation->samples_per_second, text, &args); + + switch_core_speech_flush_tts(&jss->speech->sh); + switch_ivr_speak_text_handle(jss->session, &jss->speech->sh, &jss->speech->codec, NULL, text, &args); JS_ResumeRequest(cx, cb_state.saveDepth); *rval = cb_state.ret; @@ -2389,6 +2462,8 @@ if (cx && obj) { if ((jss = JS_GetPrivate(cx, obj))) { + destroy_speech_engine(jss); + if (jss->session) { channel = switch_core_session_get_channel(jss->session); switch_channel_set_private(channel, "jss", NULL); Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.h Sat Aug 25 17:33:26 2007 @@ -122,6 +122,11 @@ typedef struct sm_module_interface sm_module_interface_t; typedef switch_status_t (*spidermonkey_init_t) (const sm_module_interface_t ** module_interface); +struct js_session_speech { + switch_speech_handle_t sh; + switch_codec_t codec; +}; + struct js_session { switch_core_session_t *session; JSContext *cx; @@ -141,6 +146,7 @@ char *rdnis; char *context; char *username; + struct js_session_speech *speech; }; JSBool DEFAULT_SET_PROPERTY(JSContext * cx, JSObject *obj, jsval id, jsval *vp) Modified: freeswitch/trunk/src/switch_core_directory.c ============================================================================== --- freeswitch/trunk/src/switch_core_directory.c (original) +++ freeswitch/trunk/src/switch_core_directory.c Sat Aug 25 17:33:26 2007 @@ -76,28 +76,3 @@ return dh->directory_interface->directory_close(dh); } -SWITCH_DECLARE(switch_status_t) switch_core_speech_open(switch_speech_handle_t *sh, - char *module_name, - char *voice_name, unsigned int rate, switch_speech_flag_t *flags, switch_memory_pool_t *pool) -{ - switch_status_t status; - - if ((sh->speech_interface = switch_loadable_module_get_speech_interface(module_name)) == 0) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid speech module [%s]!\n", module_name); - return SWITCH_STATUS_GENERR; - } - - switch_copy_string(sh->engine, module_name, sizeof(sh->engine)); - sh->flags = *flags; - if (pool) { - sh->memory_pool = pool; - } else { - if ((status = switch_core_new_memory_pool(&sh->memory_pool)) != SWITCH_STATUS_SUCCESS) { - return status; - } - switch_set_flag(sh, SWITCH_SPEECH_FLAG_FREE_POOL); - } - sh->rate = rate; - sh->name = switch_core_strdup(pool, module_name); - return sh->speech_interface->speech_open(sh, voice_name, rate, flags); -} Modified: freeswitch/trunk/src/switch_core_speech.c ============================================================================== --- freeswitch/trunk/src/switch_core_speech.c (original) +++ freeswitch/trunk/src/switch_core_speech.c Sat Aug 25 17:33:26 2007 @@ -34,6 +34,40 @@ #include <switch.h> #include "private/switch_core_pvt.h" + +SWITCH_DECLARE(switch_status_t) switch_core_speech_open(switch_speech_handle_t *sh, + char *module_name, + char *voice_name, + unsigned int rate, + unsigned int interval, + switch_speech_flag_t *flags, + switch_memory_pool_t *pool) +{ + switch_status_t status; + + if ((sh->speech_interface = switch_loadable_module_get_speech_interface(module_name)) == 0) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid speech module [%s]!\n", module_name); + return SWITCH_STATUS_GENERR; + } + + switch_copy_string(sh->engine, module_name, sizeof(sh->engine)); + sh->flags = *flags; + if (pool) { + sh->memory_pool = pool; + } else { + if ((status = switch_core_new_memory_pool(&sh->memory_pool)) != SWITCH_STATUS_SUCCESS) { + return status; + } + switch_set_flag(sh, SWITCH_SPEECH_FLAG_FREE_POOL); + } + sh->rate = rate; + sh->name = switch_core_strdup(pool, module_name); + sh->samples = switch_bytes_per_frame(rate, interval); + + return sh->speech_interface->speech_open(sh, voice_name, rate, flags); +} + + SWITCH_DECLARE(switch_status_t) switch_core_speech_feed_tts(switch_speech_handle_t *sh, char *text, switch_speech_flag_t *flags) { assert(sh != NULL); Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Sat Aug 25 17:33:26 2007 @@ -1344,7 +1344,6 @@ { switch_channel_t *channel; int interval = 0; - uint32_t len = 0; switch_frame_t write_frame = { 0 }; switch_timer_t timer; switch_core_thread_session_t thread_session; @@ -1371,7 +1370,8 @@ } memset(&sh, 0, sizeof(sh)); - if (switch_core_speech_open(&sh, tts_name, voice_name, (uint32_t) rate, &flags, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { + if (switch_core_speech_open(&sh, tts_name, voice_name, (uint32_t) rate, interval, + &flags, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module!\n"); switch_core_session_reset(session); return SWITCH_STATUS_FALSE; @@ -1381,9 +1381,6 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "OPEN TTS %s\n", tts_name); interval = read_codec->implementation->microseconds_per_frame / 1000; - sh.samples = switch_bytes_per_frame(rate, interval); - len = sh.samples * 2; - codec_name = "L16"; if (switch_core_codec_init(&codec, @@ -1409,7 +1406,7 @@ switch_core_session_reset(session); return SWITCH_STATUS_GENERR; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "setup timer success %u bytes per %d ms!\n", len, interval); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "setup timer success %u bytes per %d ms!\n", sh.samples * 2, interval); /* start a thread to absorb incoming audio */ for (stream_id = 0; stream_id < switch_core_session_get_stream_count(session); stream_id++) {

1 0

[commit] r5661 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 23 Aug '07

23 Aug '07

Author: silik0n Date: Thu Aug 23 14:34:50 2007 New Revision: 5661 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: fix and ooops Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Thu Aug 23 14:34:50 2007 @@ -1269,13 +1269,7 @@ if (argc > 1) { - tmp = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); - if (!switch_strlen_zero(tmp)) { - phrase_data = tmp; - } else { - *rval = BOOLEAN_TO_JSVAL(JS_FALSE); - return JS_TRUE; - } + phrase_data = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); } if (argc > 2) {

1 0

[commit] r5660 - freeswitch/trunk/src/mod/asr_tts/mod_openmrcp
by Freeswitch SVN 22 Aug '07

22 Aug '07

Author: achaloyan Date: Wed Aug 22 15:15:11 2007 New Revision: 5660 Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Log: add common for asr and tts FLAG_HAS_MESSAGE to indicate there is a mrcp message to process; fix processing of some mrcp responses and events. Modified: freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_openmrcp/mod_openmrcp.c Wed Aug 22 15:15:11 2007 @@ -62,14 +62,9 @@ #include "mrcp_recognizer.h" #include "mrcp_synthesizer.h" #include "mrcp_generic_header.h" -#include "mrcp_resource_set.h" #include <switch.h> -#define OPENMRCP_WAIT_TIMEOUT 5000 -#define MY_BUF_LEN 1024 * 128 -#define MY_BLOCK_SIZE MY_BUF_LEN - SWITCH_MODULE_LOAD_FUNCTION(mod_openmrcp_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_openmrcp_shutdown); SWITCH_MODULE_DEFINITION(mod_openmrcp, mod_openmrcp_load, @@ -95,12 +90,9 @@ } openmrcp_session_t; typedef enum { - FLAG_HAS_TEXT = (1 << 0), - FLAG_BARGE = (1 << 1), - FLAG_READY = (1 << 2), - FLAG_SPEAK_COMPLETE = (1 << 3), - FLAG_FEED_STARTED = (1 << 4), - FLAG_TERMINATING = (1 << 5) + FLAG_HAS_MESSAGE = (1 << 0), + FLAG_FEED_STARTED = (1 << 1), + FLAG_TERMINATING = (1 << 2) } mrcp_flag_t; typedef struct { @@ -220,38 +212,19 @@ return MRCP_STATUS_FAILURE; } - if (mrcp_message->start_line.message_type != MRCP_MESSAGE_TYPE_EVENT) { + if (mrcp_message->start_line.message_type == MRCP_MESSAGE_TYPE_RESPONSE && mrcp_message->start_line.request_state == MRCP_REQUEST_STATE_INPROGRESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "ignoring mrcp response\n"); return MRCP_STATUS_SUCCESS; } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "mrcp msg body: %s\n", mrcp_message->body); - - if (mrcp_message->channel_id.resource_id == MRCP_RESOURCE_RECOGNIZER) { - if (mrcp_message->start_line.method_id == RECOGNIZER_RECOGNITION_COMPLETE) { - openmrcp_session->mrcp_message_last_rcvd = mrcp_message; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "setting FLAG_HAS_TEXT\n"); - switch_set_flag_locked(openmrcp_session, FLAG_HAS_TEXT); - } - else if (mrcp_message->start_line.method_id == RECOGNIZER_START_OF_INPUT) { - openmrcp_session->mrcp_message_last_rcvd = mrcp_message; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "setting FLAG_BARGE\n"); - switch_set_flag_locked(openmrcp_session, FLAG_BARGE); - } - else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "ignoring event: %s\n", mrcp_message->start_line.method_name); - } - } - else if(mrcp_message->channel_id.resource_id == MRCP_RESOURCE_SYNTHESIZER) { - if (mrcp_message->start_line.method_id == SYNTHESIZER_SPEAK_COMPLETE) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "setting FLAG_SPEAK_COMPLETE\n"); - switch_set_flag_locked(openmrcp_session, FLAG_SPEAK_COMPLETE); - } - else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "ignoring event: %s\n", mrcp_message->start_line.method_name); - } + if (switch_test_flag(openmrcp_session, FLAG_HAS_MESSAGE)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "already has message\n"); + return MRCP_STATUS_SUCCESS; } - + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "setting FLAG_HAS_MESSAGE\n"); + openmrcp_session->mrcp_message_last_rcvd = mrcp_message; + switch_set_flag_locked(openmrcp_session, FLAG_HAS_MESSAGE); return MRCP_STATUS_SUCCESS; } @@ -473,8 +446,8 @@ { openmrcp_session_t *asr_session = (openmrcp_session_t *) ah->private_info; - switch_status_t rv = (switch_test_flag(asr_session, FLAG_HAS_TEXT) || switch_test_flag(asr_session, FLAG_BARGE)) ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; - + switch_status_t rv = (switch_test_flag(asr_session, FLAG_HAS_MESSAGE)) ? SWITCH_STATUS_SUCCESS : SWITCH_STATUS_FALSE; + return rv; } @@ -483,50 +456,61 @@ { openmrcp_session_t *asr_session = (openmrcp_session_t *) ah->private_info; switch_status_t ret = SWITCH_STATUS_SUCCESS; + mrcp_message_t *message; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "openmrcp_asr_get_results called\n"); - if (switch_test_flag(asr_session, FLAG_BARGE)) { - switch_clear_flag_locked(asr_session, FLAG_BARGE); - ret = SWITCH_STATUS_BREAK; - } - - if (switch_test_flag(asr_session, FLAG_HAS_TEXT)) { - /*! - we have to extract the XML but stripping off the <?xml version="1.0"?> - header. the body looks like: - - Completion-Cause:001 no-match - Content-Type: application/nlsml+xml - Content-Length: 260 - - <?xml version="1.0"?> - <result xmlns="http://www.ietf.org/xml/ns/mrcpv2" xmlns:ex="http://www.example.com/example" score="100" grammar="session:request1@form-level.store"> - <interpretation> <input mode="speech">open a</input> - </interpretation> - </result> - */ - - if(asr_session->mrcp_message_last_rcvd && asr_session->mrcp_message_last_rcvd->body) { - char *marker = "?>"; // FIXME -- lame and brittle way of doing this. use regex or better. - char *position = strstr(asr_session->mrcp_message_last_rcvd->body, marker); - if (!position) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Bad result received from mrcp server: %s", asr_session->mrcp_message_last_rcvd->body); - ret = SWITCH_STATUS_FALSE; + message = asr_session->mrcp_message_last_rcvd; + asr_session->mrcp_message_last_rcvd = NULL; + // since we are returning our result here, future calls to check_results + // should return False + switch_clear_flag_locked(asr_session, FLAG_HAS_MESSAGE); + + if (message->start_line.message_type == MRCP_MESSAGE_TYPE_RESPONSE) { + if (message->start_line.status_code != MRCP_STATUS_CODE_SUCCESS && + message->start_line.status_code != MRCP_STATUS_CODE_SUCCESS_WITH_IGNORE) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "error code received [%d]\n", message->start_line.status_code); + ret = SWITCH_STATUS_FALSE; + } + } + else if (message->start_line.message_type == MRCP_MESSAGE_TYPE_EVENT) { + if (message->start_line.method_id == RECOGNIZER_RECOGNITION_COMPLETE) { + /*! + we have to extract the XML but stripping off the <?xml version="1.0"?> + header. the body looks like: + + Completion-Cause:001 no-match + Content-Type: application/nlsml+xml + Content-Length: 260 + + <?xml version="1.0"?> + <result xmlns="http://www.ietf.org/xml/ns/mrcpv2" xmlns:ex="http://www.example.com/example" score="100" grammar="session:request1@form-level.store"> + <interpretation> <input mode="speech">open a</input> + </interpretation> + </result> + */ + + if(message->body) { + char *marker = "?>"; // FIXME -- lame and brittle way of doing this. use regex or better. + char *position = strstr(message->body, marker); + if (!position) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Bad result received from mrcp server: %s", message->body); + ret = SWITCH_STATUS_FALSE; + } + else { + position += strlen(marker); + *xmlstr = strdup(position); + } } else { - position += strlen(marker); - *xmlstr = strdup(position); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No result received from mrcp server\n"); + ret = SWITCH_STATUS_FALSE; } - } - else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No result received from mrcp server\n"); - ret = SWITCH_STATUS_FALSE; - } - // since we are returning our result here, future calls to check_results - // should return False - switch_clear_flag_locked(asr_session, FLAG_HAS_TEXT); - ret = SWITCH_STATUS_SUCCESS; + ret = SWITCH_STATUS_SUCCESS; + } + else if (message->start_line.method_id == RECOGNIZER_START_OF_INPUT) { + ret = SWITCH_STATUS_BREAK; + } } return ret; } @@ -658,10 +642,25 @@ media_frame_t media_frame; audio_source_t *audio_source; - if (switch_test_flag(tts_session, FLAG_SPEAK_COMPLETE)) { - /* tell fs we are done */ - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FLAG_SPEAK_COMPLETE\n"); - return SWITCH_STATUS_BREAK; + if (switch_test_flag(tts_session, FLAG_HAS_MESSAGE)) { + mrcp_message_t *message = tts_session->mrcp_message_last_rcvd; + tts_session->mrcp_message_last_rcvd = NULL; + switch_clear_flag_locked(tts_session, FLAG_HAS_MESSAGE); + + if (message->start_line.message_type == MRCP_MESSAGE_TYPE_RESPONSE) { + if (message->start_line.status_code != MRCP_STATUS_CODE_SUCCESS && + message->start_line.status_code != MRCP_STATUS_CODE_SUCCESS_WITH_IGNORE) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "error code received [%d]\n", message->start_line.status_code); + return SWITCH_STATUS_BREAK; + } + } + else if (message->start_line.message_type == MRCP_MESSAGE_TYPE_EVENT) { + if (message->start_line.method_id == SYNTHESIZER_SPEAK_COMPLETE) { + /* tell fs we are done */ + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "FLAG_SPEAK_COMPLETE\n"); + return SWITCH_STATUS_BREAK; + } + } } audio_source = mrcp_client_audio_source_get(tts_session->audio_channel);

1 0

[commit] r5659 - in freeswitch/trunk/scripts: . py_modules
by Freeswitch SVN 22 Aug '07

22 Aug '07

Author: greenlizard Date: Wed Aug 22 10:23:28 2007 New Revision: 5659 Added: freeswitch/trunk/scripts/py_modules/ freeswitch/trunk/scripts/py_modules/__init__.py freeswitch/trunk/scripts/py_modules/speechtools.py freeswitch/trunk/scripts/recipewizard.py Log: speech recognition demo in python Added: freeswitch/trunk/scripts/py_modules/__init__.py ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/py_modules/__init__.py Wed Aug 22 10:23:28 2007 @@ -0,0 +1 @@ +# empty Added: freeswitch/trunk/scripts/py_modules/speechtools.py ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/py_modules/speechtools.py Wed Aug 22 10:23:28 2007 @@ -0,0 +1,198 @@ +from freeswitch import * +from xml.dom import minidom + +VOICE_ENGINE = "cepstral" +VOICE = "William" + +""" +A few classes that make it easier to write speech applications +using Python. It is roughly modelled after the equivalent that +is written in JavaScript. + +Status: should work, but not yet complete. some pending items +are mentioned in comments +""" + +class Grammar: + def __init__(self, name, path, obj_path, + min_score=1, confirm_score=400, halt=False): + """ + @param name - name of grammar to reference it later + @param path - path to xml grammar file + @param obj_path - xml path to find interpretation from root + in result xml, eg, 'interpretation' + @param min_score - score threshold to accept result + @param confirm_score - if score below this threshold, ask user + if they are sure this is correct + @param halt - not sure what was used for in js, currently unused + """ + self.name=name + self.path=path + self.obj_path=obj_path + self.min_score=min_score + self.confirm_score=confirm_score + self.halt=halt + + +class SpeechDetect: + + def __init__(self, session, module_name, ip_addr): + self.session=session + self.module_name=module_name + self.ip_addr=ip_addr + self.grammars = {} + + def addGrammar(self, grammar): + self.grammars[grammar.name]=grammar + + def setGrammar(self, name): + self.grammar = self.grammars[name] + + def detectSpeech(self): + # TODO: we might not always want to call detect_speech + # with this cmd, see js version for other options + # also see detect_speech_function() in mod_dptools.c + cmd = "%s %s %s %s" % (self.module_name, + self.grammar.name, + self.grammar.path, + self.ip_addr) + console_log("debug", "calling detect_speech with: %s\n" % cmd) + self.session.execute("detect_speech", cmd) + console_log("debug", "finished calling detect_speech\n") + +class SpeechObtainer: + + def __init__(self, speech_detect, required_phrases, wait_time, max_tries): + """ + @param speech_detect - the speech detect object, which holds a + reference to underlying session and can + be re-used by many SpeechObtainers + @param required_phrases - the number of required phrases from the + grammar. for example if its prompting for + the toppings on a sandwhich and min toppings + is 3, use 3. normally will be 1. + @param wait_time - the time, in millisconds, to wait for + input during each loop iteration + @param max_tries - this number multiplied by wait time gives the + 'total wait time' before we give up and return + partial or no result + """ + self.speech_detect=speech_detect + self.required_phrases=required_phrases + self.wait_time=wait_time + self.max_tries=max_tries + + self.detected_phrases = [] + + def setGrammar(self, grammar): + """ + @param grammar - instance of grammar class + """ + self.grammar=grammar + self.speech_detect.addGrammar(grammar) + self.speech_detect.setGrammar(self.grammar.name) + + def detectSpeech(self): + self.speech_detect.detectSpeech() + + def run(self): + """ + start speech detection with the current grammar, + and listen for results from asr engine. once a result + has been returned, return it to caller + """ + + def dtmf_handler(input, itype, funcargs): + console_log("INFO","\n\nDTMF itype: %s\n" % itype) + if itype == 1: # TODO!! use names for comparison instead of number + return self.handle_event(input, funcargs) + elif itype== 0: + console_log("INFO","\n\nDTMF input: %s\n" % input) + else: + console_log("INFO","\n\nUnknown input type: %s\n" % itype) + return None + + + num_tries = 0 + + session = self.speech_detect.session + + console_log("debug", "setting dtmf callback\n") + session.setDTMFCallback(dtmf_handler, "") + console_log("debug", "calling getDigits\n") + + console_log("debug", "starting run() while loop\n") + while (session.ready() and + num_tries < self.max_tries and + len(self.detected_phrases) < self.required_phrases): + console_log("debug", "top of run() while loop\n") + session.collectDigits(self.wait_time) + num_tries += 1 + + console_log("debug", "while loop finished\n") + return self.detected_phrases + + def handle_event(self, event, funcargs): + """ + when the dtmf handler receives an event, it calls back + this method. event is a dictionary with subdictionaries .. + + Example 1 + ========= + + {'body': None, 'headers': {'Speech-Type': 'begin-speaking'}} + + Example 2 + ========= + {'body': '<result xmlns='http://www.ietf.org/xml/ns/mrcpv2' + xmlns:ex='http://www.example.com/example' score='100' + grammar='session:request1@form-level.store'><interpretation> + <input mode='speech'>waffles</input></interpretation></result>', + 'headers': {'Speech-Type': 'detected-speech'}} + + This dictionary is constructed in run_dtmf_callback() in + freeswitch_python.cpp + + """ + + # what kind of event? + headers = event['headers'] + speech_type = headers['Speech-Type'] + if speech_type == "begin-speaking": + # not sure what to do with this, try returning "stop" + # so that it might stop playing a sound file once + # speech has been detected + return "stop" + elif speech_type == "detected-speech": + # extract the detected phrase. from result + # BUG: this assumes only ONE interpretation in the xml + # result. rest will get igored + # NOTE: have to wrap everything with str() (at least + # calls to console_log because otherwise it chokes on + # unicode strings. + # TODO: check the score + body = event['body'] + dom = minidom.parseString(body) + phrase = dom.getElementsByTagName(self.grammar.obj_path)[0] + phrase_text = self.getText(phrase) + if phrase_text: + self.detected_phrases.append(str(phrase_text)) + # do we want to return stop? what should we return? + return "stop" + else: + raise Exception("Unknown speech event: %s" % speech_type) + + + def getText(self, elt): + + """ given an element, get its text. if there is more than + one text node child, just append all the text together. + """ + + result = "" + children = elt.childNodes + for child in children: + if child.nodeType == child.TEXT_NODE: + result += str(child.nodeValue) + return result + Added: freeswitch/trunk/scripts/recipewizard.py ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/recipewizard.py Wed Aug 22 10:23:28 2007 @@ -0,0 +1,87 @@ +from freeswitch import * +from py_modules.speechtools import Grammar, SpeechDetect +from py_modules.speechtools import SpeechObtainer + +import time, os + +VOICE_ENGINE = "cepstral" +VOICE = "William" +GRAMMAR_ROOT = "/usr/src/freeswitch_trunk/scripts" + +""" +Example speech recognition application in python. + +How to make this work: + +* Get mod_openmrcp working along with an MRCP asr server +* Add /usr/src/freeswitch/scripts or equivalent to your PYTHONPATH +* Restart freeswitch +* Create $GRAMMAR_ROOT/mainmenu.xml from contents in mainmenu() comments + +""" + +class RecipeWizard: + + def __init__(self, session): + self.session=session + self.session.set_tts_parms(VOICE_ENGINE, VOICE) + self.main() + + def main(self): + + console_log("debug", "recipe wizard main()\n") + self.speechdetect = SpeechDetect(self.session, "openmrcp", "127.0.0.1"); + self.speechobtainer = SpeechObtainer(speech_detect=self.speechdetect, + required_phrases=1, + wait_time=5000, + max_tries=3) + gfile = os.path.join(GRAMMAR_ROOT, "mainmenu.xml") + self.grammar = Grammar("mainmenu", gfile,"input",80,90) + self.speechobtainer.setGrammar(self.grammar); + console_log("debug", "calling speechobtainer.run()\n") + self.speechobtainer.detectSpeech() + self.session.speak("Hello. Welcome to the recipe wizard. Drinks or food?") + result = self.speechobtainer.run() + console_log("debug", "speechobtainer.run() result: %s\n" % result) + if result: + self.session.speak("Received result. Result is: %s" % result[0]) + else: + self.session.speak("Sorry, I did not hear you") + + console_log("debug", "speechobtainer.run() finished\n") + +def mainmenu(): + """ + <!DOCTYPE grammar PUBLIC "-//W3C//DTD GRAMMAR 1.0//EN" + "http://www.w3.org/TR/speech-grammar/grammar.dtd"> + + <grammar xmlns="http://www.w3.org/2001/06/grammar" xml:lang="en" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://www.w3.org/2001/06/grammar + http://www.w3.org/TR/speech-grammar/grammar.xsd" + version="1.0" mode="voice" root="root"> + + + <rule id="root" scope="public"> + + <rule id="main"> + <one-of> + <item weight="10">drinks</item> + <item weight="2">food</item> + </one-of> + </rule> + + </rule> + + </grammar> + + """ + pass + +def handler(uuid): + session = PySession(uuid) + session.answer() + rw = RecipeWizard(session) + session.hangup("1") + +

1 0

[commit] r5658 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 22 Aug '07

22 Aug '07

Author: mikej Date: Wed Aug 22 09:16:37 2007 New Revision: 5658 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Log: map 404 correct per rfc 4497 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c Wed Aug 22 09:16:37 2007 @@ -1369,6 +1369,7 @@ case 603: return SWITCH_CAUSE_CALL_REJECTED; case 404: + return SWITCH_CAUSE_UNALLOCATED; case 485: case 604: return SWITCH_CAUSE_NO_ROUTE_DESTINATION;

1 0

[commit] r5657 - freeswitch/trunk/src
by Freeswitch SVN 22 Aug '07

22 Aug '07

Author: mikej Date: Tue Aug 21 23:10:08 2007 New Revision: 5657 Modified: freeswitch/trunk/src/switch_core_session.c Log: pass new caller profile vars across the bridge. Modified: freeswitch/trunk/src/switch_core_session.c ============================================================================== --- freeswitch/trunk/src/switch_core_session.c (original) +++ freeswitch/trunk/src/switch_core_session.c Tue Aug 21 23:10:08 2007 @@ -218,6 +218,11 @@ caller_profile->rdnis, caller_profile->source, caller_profile->context, caller_profile->destination_number); outgoing_profile->flags = caller_profile->flags; + outgoing_profile->caller_ton = caller_profile->caller_ton; + outgoing_profile->caller_numplan = caller_profile->caller_numplan; + outgoing_profile->destination_number_ton = caller_profile->destination_number_ton; + outgoing_profile->destination_number_numplan = caller_profile->destination_number_numplan; + } } if (!outgoing_profile) {

1 0

[commit] r5656 - freeswitch/trunk/src
by Freeswitch SVN 22 Aug '07

22 Aug '07

Author: mikej Date: Tue Aug 21 22:55:19 2007 New Revision: 5656 Modified: freeswitch/trunk/src/switch_ivr_originate.c Log: pass new caller profile vars across the bridge. Modified: freeswitch/trunk/src/switch_ivr_originate.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_originate.c (original) +++ freeswitch/trunk/src/switch_ivr_originate.c Tue Aug 21 22:55:19 2007 @@ -489,6 +489,10 @@ caller_caller_profile->rdnis, caller_caller_profile->source, caller_caller_profile->context, chan_data); new_profile->flags = caller_caller_profile->flags; + new_profile->caller_ton = caller_caller_profile->caller_ton; + new_profile->caller_numplan = caller_caller_profile->caller_numplan; + new_profile->destination_number_ton = caller_caller_profile->destination_number_ton; + new_profile->destination_number_numplan = caller_caller_profile->destination_number_numplan; pool = NULL; } else { if (!cid_name_override) { @@ -515,6 +519,10 @@ caller_profile_override->aniii, caller_profile_override->rdnis, caller_profile_override->source, caller_profile_override->context, chan_data); + new_profile->caller_ton = caller_profile_override->caller_ton; + new_profile->caller_numplan = caller_profile_override->caller_numplan; + new_profile->destination_number_ton = caller_profile_override->destination_number_ton; + new_profile->destination_number_numplan = caller_profile_override->destination_number_numplan; } else { new_profile = switch_caller_profile_new(pool, NULL,

1 0

[commit] r5655 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 22 Aug '07

22 Aug '07

Author: mikej Date: Tue Aug 21 20:22:22 2007 New Revision: 5655 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: add utility app for profile vars Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c (original) +++ freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Tue Aug 21 20:22:22 2007 @@ -346,6 +346,88 @@ } } + +SWITCH_STANDARD_APP(set_profile_var_function) +{ + switch_channel_t *channel; + switch_caller_profile_t *caller_profile; + char *name, *val = NULL; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + caller_profile = switch_channel_get_caller_profile(channel); + + if (switch_strlen_zero(data)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n"); + } else { + name = switch_core_session_strdup(session, data); + val = strchr(name, '='); + + if (val) { + *val++ = '\0'; + if (switch_strlen_zero(val)) { + val = NULL; + } + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET_PROFILE_VAR [%s]=[%s]\n", name, val ? val : "UNDEF"); + + if (!strcasecmp(name, "dialplan")) { + caller_profile->dialplan = val; + } + if (!strcasecmp(name, "username")) { + caller_profile->username = val; + } + if (!strcasecmp(name, "caller_id_name")) { + caller_profile->caller_id_name = val; + } + if (!strcasecmp(name, "caller_id_number")) { + caller_profile->caller_id_number = val; + } + if (!strcasecmp(name, "caller_ton")) { + caller_profile->caller_ton = (uint8_t)atoi(val); + } + if (!strcasecmp(name, "caller_numplan")) { + caller_profile->caller_numplan = (uint8_t)atoi(val); + } + if (!strcasecmp(name, "destination_number_ton")) { + caller_profile->destination_number_ton = (uint8_t)atoi(val); + } + if (!strcasecmp(name, "destination_number_numplan")) { + caller_profile->destination_number_numplan = (uint8_t)atoi(val); + } + if (!strcasecmp(name, "ani")) { + caller_profile->ani = val; + } + if (!strcasecmp(name, "aniii")) { + caller_profile->aniii = val; + } + if (!strcasecmp(name, "network_addr")) { + caller_profile->network_addr = val; + } + if (!strcasecmp(name, "rdnis")) { + caller_profile->rdnis = val; + } + if (!strcasecmp(name, "destination_number")) { + caller_profile->destination_number = val; + } + if (!strcasecmp(name, "uuid")) { + caller_profile->uuid = val; + } + if (!strcasecmp(name, "source")) { + caller_profile->source = val; + } + if (!strcasecmp(name, "context")) { + caller_profile->context = val; + } + if (!strcasecmp(name, "chan_name")) { + caller_profile->chan_name = val; + } + } +} + + SWITCH_STANDARD_APP(export_function) { switch_channel_t *channel; @@ -1141,6 +1223,7 @@ #define SCHED_HANGUP_DESCR "Schedule a hangup in the future" #define UNSET_LONG_DESC "Unset a channel varaible for the channel calling the application." #define SET_LONG_DESC "Set a channel varaible for the channel calling the application." +#define SET_PROFILE_VAR_LONG_DESC "Set a caller profile varaible for the channel calling the application." #define EXPORT_LONG_DESC "Set and export a channel varaible for the channel calling the application." #define LOG_LONG_DESC "Logs a channel varaible for the channel calling the application." #define TRANSFER_LONG_DESC "Immediatly transfer the calling channel to a new extension" @@ -1171,6 +1254,7 @@ SWITCH_ADD_APP(app_interface, "event", "Fire an event", "Fire an event", event_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "export", "Export a channel varaible across a bridge", EXPORT_LONG_DESC, export_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "set", "Set a channel varaible", SET_LONG_DESC, set_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); + SWITCH_ADD_APP(app_interface, "set_profile_var", "Set a caller profile varaible", SET_PROFILE_VAR_LONG_DESC, set_profile_var_function, "<varname>=<value>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "unset", "Unset a channel varaible", UNSET_LONG_DESC, unset_function, "<varname>", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "ring_ready", "Indicate Ring_Ready", "Indicate Ring_Ready on a channel.", ring_ready_function, "", SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "break", "Break", "Set the break flag.", break_function, "", SAF_SUPPORT_NOMEDIA);

1 0

[commit] r5654 - freeswitch/trunk/src/mod/xml_int/mod_xml_curl
by Freeswitch SVN 22 Aug '07

22 Aug '07

Author: mikej Date: Tue Aug 21 20:21:09 2007 New Revision: 5654 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Log: fix windows build Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_curl/mod_xml_curl.c Tue Aug 21 20:21:09 2007 @@ -72,7 +72,7 @@ xml_binding_t *binding = (xml_binding_t *) user_data; char *file_url; struct curl_slist *slist = NULL; - long httpRes; + long httpRes = 0; if (!binding) { return NULL;

1 0

[commit] r5653 - freeswitch/trunk/src/mod/languages/mod_spidermonkey
by Freeswitch SVN 21 Aug '07

21 Aug '07

Author: anthm Date: Tue Aug 21 15:00:06 2007 New Revision: 5653 Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Log: let session.sayPhrase method take a blank language string Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original) +++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Aug 21 15:00:06 2007 @@ -1242,6 +1242,7 @@ char *phrase_name = NULL; char *phrase_data = NULL; char *phrase_lang = NULL; + char *tmp = NULL; //char *input_callback = NULL; void *bp = NULL; int len = 0; @@ -1268,11 +1269,20 @@ if (argc > 1) { - phrase_data = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + tmp = JS_GetStringBytes(JS_ValueToString(cx, argv[1])); + if (!switch_strlen_zero(tmp)) { + phrase_data = tmp; + } else { + *rval = BOOLEAN_TO_JSVAL(JS_FALSE); + return JS_TRUE; + } } if (argc > 2) { - phrase_lang = JS_GetStringBytes(JS_ValueToString(cx, argv[2])); + tmp = JS_GetStringBytes(JS_ValueToString(cx, argv[2])); + if (!switch_strlen_zero(tmp)) { + phrase_lang = tmp; + } } if (argc > 3) {

1 0