- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r1575 - freeswitch/trunk/conf
by anthm＠freeswitch.org 08 Jun '06

08 Jun '06

Author: anthm Date: Thu Jun 8 15:31:12 2006 New Revision: 1575 Modified: freeswitch/trunk/conf/freeswitch.xml Log: ivr stuff (part 3) Modified: freeswitch/trunk/conf/freeswitch.xml ============================================================================== --- freeswitch/trunk/conf/freeswitch.xml (original) +++ freeswitch/trunk/conf/freeswitch.xml Thu Jun 8 15:31:12 2006 @@ -256,6 +256,15 @@  </settings> </configuration> + + <configuration name="rss.conf" description="RSS Parser"> + <feeds> +  +  +  + </feeds> + </configuration> + </section> <section name="dialplan" description="Regex/XML Dialplan"> <!-- Valid fields in conditions:

1 0

[commit] r1574 - freeswitch/trunk/src/mod/applications/mod_rss
by anthm＠freeswitch.org 08 Jun '06

08 Jun '06

Author: anthm Date: Thu Jun 8 15:26:39 2006 New Revision: 1574 Added: freeswitch/trunk/src/mod/applications/mod_rss/ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Log: ivr stuff (part 2) Added: freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c ============================================================================== --- (empty file) +++ freeswitch/trunk/src/mod/applications/mod_rss/mod_rss.c Thu Jun 8 15:26:39 2006 @@ -0,0 +1,605 @@ +/* + * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * Copyright (C) 2005/2006, Anthony Minessale II <anthmct(a)yahoo.com> + * + * Version: MPL 1.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application + * + * The Initial Developer of the Original Code is + * Anthony Minessale II <anthmct(a)yahoo.com> + * Portions created by the Initial Developer are Copyright (C) + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Anthony Minessale II <anthmct(a)yahoo.com> + * + * + * mod_rss.c -- RSS Browser + * + */ +#include <switch.h> + +static const char modname[] = "mod_rss"; + +typedef enum { + SFLAG_INSTRUCT = (1 << 0), + SFLAG_INFO = (1 << 1), + SFLAG_MAIN = (1 << 2) +} SFLAGS; + +/* helper object */ +struct dtmf_buffer { + int32_t index; + uint32_t flags; + int32_t speed; + char voice[80]; + switch_speech_handle_t *sh; +}; + +#define TTS_MEAN_SPEED 170 +#define TTS_MAX_ENTRIES 99 +#define TTS_DEFAULT_ENGINE "cepstral" +#define TTS_DEFAULT_VOICE "david" + +struct shashdot_entry { + uint8_t inuse; + char *title_txt; + char *description_txt; + char *subject_txt; + char *dept_txt; +}; + +/* + dtmf handler function you can hook up to be executed when a digit is dialed during playback + if you return anything but SWITCH_STATUS_SUCCESS the playback will stop. +*/ +static switch_status_t on_dtmf(switch_core_session_t *session, char *dtmf, void *buf, unsigned int buflen) +{ + + struct dtmf_buffer *dtb; + dtb = (struct dtmf_buffer *) buf; + + switch(*dtmf) { + case '#': + switch_set_flag(dtb, SFLAG_MAIN); + return SWITCH_STATUS_BREAK; + case '6': + dtb->index++; + return SWITCH_STATUS_BREAK; + case '4': + dtb->index--; + return SWITCH_STATUS_BREAK; + case '*': + if (switch_test_flag(dtb->sh, SWITCH_SPEECH_FLAG_PAUSE)) { + switch_clear_flag(dtb->sh, SWITCH_SPEECH_FLAG_PAUSE); + } else { + switch_set_flag(dtb->sh, SWITCH_SPEECH_FLAG_PAUSE); + } + break; + case '5': + switch_core_speech_text_param_tts(dtb->sh, "voice", "next"); + switch_set_flag(dtb, SFLAG_INFO); + return SWITCH_STATUS_BREAK; + break; + case '9': + switch_core_speech_text_param_tts(dtb->sh, "voice", dtb->voice); + switch_set_flag(dtb, SFLAG_INFO); + return SWITCH_STATUS_BREAK; + break; + case '2': + if (dtb->speed < 220) { + dtb->speed += 20; + switch_core_speech_numeric_param_tts(dtb->sh, "speech/rate", dtb->speed); + switch_set_flag(dtb, SFLAG_INFO); + return SWITCH_STATUS_BREAK; + } + break; + case '7': + dtb->speed = TTS_MEAN_SPEED; + switch_core_speech_numeric_param_tts(dtb->sh, "speech/rate", dtb->speed); + switch_set_flag(dtb, SFLAG_INFO); + return SWITCH_STATUS_BREAK; + case '8': + if (dtb->speed > 80) { + dtb->speed -= 20; + switch_core_speech_numeric_param_tts(dtb->sh, "speech/rate", dtb->speed); + switch_set_flag(dtb, SFLAG_INFO); + return SWITCH_STATUS_BREAK; + } + break; + case '0': + switch_set_flag(dtb, SFLAG_INSTRUCT); + return SWITCH_STATUS_BREAK; + } + + return SWITCH_STATUS_SUCCESS; +} + +static void rss_function(switch_core_session_t *session, char *data) +{ + switch_channel_t *channel; + switch_status_t status; + switch_frame_t *read_frame; + const char *err = NULL; + struct dtmf_buffer dtb = {0}; + switch_xml_t xml = NULL, item, xchannel = NULL; + struct shashdot_entry entries[TTS_MAX_ENTRIES] = {}; + uint32_t i = 0; + char *title_txt = "", *description_txt = "", *rights_txt = ""; + switch_codec_t speech_codec, *codec = switch_core_session_get_read_codec(session); + char *engine = TTS_DEFAULT_ENGINE; + char *voice = TTS_DEFAULT_VOICE; + char *timer_name = NULL; + switch_speech_handle_t sh; + switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_TTS; + switch_core_thread_session_t thread_session; + uint32_t rate, interval = 20, stream_id = 0; + switch_timer_t timer = {0}, *timerp = NULL; + uint32_t last; + char *mydata = NULL; + char *filename = NULL; + char *argv[3], *feed_list[TTS_MAX_ENTRIES] = {0} , *feed_names[TTS_MAX_ENTRIES] = {0}; + int argc, feed_index = 0; + char *cf = "rss.conf"; + switch_xml_t cfg, cxml, feeds, feed; + char buf[1024]; + uint32_t jumpto = -1; + + if (!(cxml = switch_xml_open_cfg(cf, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + return; + } + + if ((feeds = switch_xml_child(cfg, "feeds"))) { + for (feed = switch_xml_child(feeds, "feed"); feed; feed = feed->next) { + char *name = (char *) switch_xml_attr_soft(feed, "name"); + + if (!name) { + name = "Error No Name."; + } + + feed_names[feed_index] = switch_core_session_strdup(session, name); + feed_list[feed_index] = switch_core_session_strdup(session, feed->txt); + feed_index++; + } + } + + switch_xml_free(cxml); + + if (!switch_strlen_zero(data)) { + if ((mydata = switch_core_session_strdup(session, data))) { + argc = switch_separate_string(mydata, ' ', argv, sizeof(argv)/sizeof(argv[0])); + + if (argv[0]) { + engine = argv[0]; + if (argv[1]) { + voice = argv[1]; + if (argv[2]) { + jumpto = atoi(argv[2]); + } + } + } + } + } + + if (!feed_index) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No Feeds Specified!\n"); + return; + } + + if (codec) { + rate = codec->implementation->samples_per_second; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Codec Error!\n"); + return; + } + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + + switch_channel_answer(channel); + + + memset(&sh, 0, sizeof(sh)); + if (switch_core_speech_open(&sh, + engine, + voice, + rate, + &flags, + switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module!\n"); + return; + } + + if (switch_core_codec_init(&speech_codec, + "L16", + (int)rate, + interval, + 1, + SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, + NULL, + switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activated\n"); + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n", rate, interval); + flags = 0; + switch_core_speech_close(&sh, &flags); + return; + } + + if (timer_name) { + if (switch_core_timer_init(&timer, timer_name, interval, (int)(rate / 50), switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n"); + switch_core_codec_destroy(&speech_codec); + flags = 0; + switch_core_speech_close(&sh, &flags); + return; + } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "setup timer success %u bytes per %d ms!\n", (rate / 50)*2, interval); + + /* start a thread to absorb incoming audio */ + for (stream_id = 0; stream_id < switch_core_session_get_stream_count(session); stream_id++) { + switch_core_service_session(session, &thread_session, stream_id); + } + timerp = &timer; + } + + + while (switch_channel_ready(channel)) { + int32_t len = 0, idx = 0; + char cmd[3]; + main_menu: + filename = NULL; + len = idx = 0; + *cmd = '\0'; + + if (jumpto > -1) { + snprintf(cmd, sizeof(cmd), "%d", jumpto); + } else { + switch_core_speech_flush_tts(&sh); + snprintf(buf + len, sizeof(buf) - len, + "Main Menu. <break time=\"600ms\"/> Choose one of the following Feeds or press pound to exit. <break time=\"600ms\"/>"); + len = strlen(buf); + + for (idx = 0; idx < feed_index; idx++) { + snprintf(buf + len, sizeof(buf) - len, "Feed Number %d %s. <break time=\"600ms\"/>", idx + 1, feed_names[idx]); + len = strlen(buf); + } + + + snprintf(buf + len, sizeof(buf) - len, "<break time=\"2000ms\"/>"); + len = strlen(buf); + + status = switch_ivr_speak_text_handle(session, + &sh, + &speech_codec, + timerp, + NULL, + buf, + cmd, + sizeof(cmd)); + if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { + goto finished; + } + } + if (!switch_strlen_zero(cmd)) { + int32_t i; + + if (*cmd == '#') { + break; + } + + i = atoi(cmd) - 1; + + if (i >= 0 && i <= feed_index) { + filename = feed_list[i]; + } + } + + if (!filename) { + continue; + } + + + if (!(xml = switch_xml_parse_file(filename))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", filename); + goto finished; + } + + err = switch_xml_error(xml); + + if (!switch_strlen_zero(err)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Error [%s]\n", err); + goto finished; + } + + if ((xchannel = switch_xml_child(xml, "channel"))) { + switch_xml_t title, description, rights; + + if ((title = switch_xml_child(xchannel, "title"))) { + title_txt = title->txt; + } + + if ((description = switch_xml_child(xchannel, "description"))) { + description_txt = description->txt; + } + + if ((rights = switch_xml_child(xchannel, "dc:rights"))) { + rights_txt = rights->txt; + } + } + + + if (!(item = switch_xml_child(xml, "item"))) { + if (xchannel) { + item = switch_xml_child(xchannel, "item"); + } + } + + for (i = 0; item; item = item->next) { + switch_xml_t title, description, subject, dept; + char *p; + + entries[i].inuse = 1; + entries[i].title_txt = NULL; + entries[i].description_txt = NULL; + entries[i].subject_txt = NULL; + entries[i].dept_txt = NULL; + + + if ((title = switch_xml_child(item, "title"))) { + entries[i].title_txt = title->txt; + } + + if ((description = switch_xml_child(item, "description"))) { + char *t, *e; + entries[i].description_txt = description->txt; + for(;;) { + if (!(t = strchr(entries[i].description_txt, '<'))) { + break; + } + if (!(e = strchr(t, '>'))) { + break; + } + + memset(t, 32, ++e-t); + } + } + + if ((subject = switch_xml_child(item, "dc:subject"))) { + entries[i].subject_txt = subject->txt; + } + + if ((dept = switch_xml_child(item, "slash:department"))) { + entries[i].dept_txt = dept->txt; + } + + if (entries[i].description_txt && (p = strchr(entries[i].description_txt, '<'))) { + *p = '\0'; + } + +#ifdef _STRIP_SOME_CHARS_ + for(p = entries[i].description_txt; *p; p++) { + if (*p == '\'' || *p == '"' || *p == ':') { + *p = ' '; + } + } +#endif + + i++; + } + + for (dtb.index = 0; dtb.index < 10; dtb.index++) { + if ((status = switch_core_session_read_frame(session, &read_frame, -1, 0)) != SWITCH_STATUS_SUCCESS) { + switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER); + goto done; + } + } + + if (switch_channel_ready(channel)) { + switch_time_exp_t tm; + char date[80] = ""; + switch_size_t retsize; + char cmd[5] = ""; + + switch_time_exp_lt(&tm, switch_time_now()); + switch_strftime(date, &retsize, sizeof(date), "%A, %B %d, %Y. %I:%M %p", &tm); + + + snprintf(buf, sizeof(buf), "%s. %s. %s. local time: %s, Press 0 for options or pound to return to the main menu. ", + title_txt, description_txt, rights_txt, date); + status = switch_ivr_speak_text_handle(session, + &sh, + &speech_codec, + timerp, + NULL, + buf, + cmd, + sizeof(cmd)); + if (status != SWITCH_STATUS_SUCCESS && status != SWITCH_STATUS_BREAK) { + goto finished; + } + if (!switch_strlen_zero(cmd)) { + switch (*cmd) { + case '0': + switch_set_flag(&dtb, SFLAG_INSTRUCT); + break; + } + } + } + + for(last = 0; last < TTS_MAX_ENTRIES; last++) { + if (!entries[last].inuse) { + last--; + break; + } + } + + dtb.index = 0; + dtb.sh = &sh; + dtb.speed = TTS_MEAN_SPEED; + switch_set_flag(&dtb, SFLAG_INFO); + switch_copy_string(dtb.voice, voice, sizeof(dtb.voice)); + while(entries[0].inuse && switch_channel_ready(channel)) { + while(switch_channel_ready(channel)) { + uint8_t cont = 0; + + if (dtb.index >= TTS_MAX_ENTRIES) { + dtb.index = 0; + } + if (dtb.index < 0) { + dtb.index = last; + } + + if (!entries[dtb.index].inuse) { + dtb.index = 0; + continue; + } + if (switch_channel_ready(channel)) { + char buf[1024] = ""; + uint32_t len = 0; + + if (switch_test_flag(&dtb, SFLAG_MAIN)) { + switch_clear_flag(&dtb, SFLAG_MAIN); + goto main_menu; + } + if (switch_test_flag(&dtb, SFLAG_INFO)) { + switch_clear_flag(&dtb, SFLAG_INFO); + snprintf(buf + len, sizeof(buf) - len, + "Hello my name is %s %s. I am speaking at %u words per minute. ", + sh.engine, + sh.voice, + dtb.speed + ); + len = strlen(buf); + } + + if (switch_test_flag(&dtb, SFLAG_INSTRUCT)) { + switch_clear_flag(&dtb, SFLAG_INSTRUCT); + cont = 1; + snprintf(buf + len, sizeof(buf) - len, + "Press star to pause or resume speech. " + "To go to the next item, press six. " + "To go back, press 4. " + "Press eight to go faster, two to slow down, or 7 to resume normal speed. " + "To change voices, press five. To restore the original voice press 9. " + "To hear these options again, press zero or press pound to return to the main menu. "); + } else { + snprintf(buf + len, sizeof(buf) - len, "Story %d. ", dtb.index + 1); + len = strlen(buf); + + if (entries[dtb.index].subject_txt) { + snprintf(buf + len, sizeof(buf) - len, "Subject %s. ", entries[dtb.index].subject_txt); + len = strlen(buf); + } + + if (entries[dtb.index].dept_txt) { + snprintf(buf + len, sizeof(buf) - len, "From the %s department. ", entries[dtb.index].dept_txt); + len = strlen(buf); + } + + if (entries[dtb.index].title_txt) { + snprintf(buf + len, sizeof(buf) - len, "%s", entries[dtb.index].title_txt); + len = strlen(buf); + } + } + switch_core_speech_flush_tts(&sh); + status = switch_ivr_speak_text_handle(session, + &sh, + &speech_codec, + timerp, + on_dtmf, + buf, + &dtb, + sizeof(dtb)); + if (status == SWITCH_STATUS_BREAK) { + continue; + } else if (status != SWITCH_STATUS_SUCCESS) { + goto finished; + } + + if (cont) { + cont = 0; + continue; + } + + status = switch_ivr_speak_text_handle(session, + &sh, + &speech_codec, + timerp, + on_dtmf, + entries[dtb.index].description_txt, + &dtb, + sizeof(dtb)); + if (status == SWITCH_STATUS_BREAK) { + continue; + } else if (status != SWITCH_STATUS_SUCCESS) { + goto finished; + } + } + + dtb.index++; + } + } + } + + finished: + switch_core_speech_close(&sh, &flags); + switch_core_codec_destroy(&speech_codec); + + if (timerp) { + /* End the audio absorbing thread */ + switch_core_thread_session_end(&thread_session); + switch_core_timer_destroy(&timer); + } + + done: + switch_xml_free(xml); + + switch_core_session_reset(session); +} + +static const switch_application_interface_t rss_application_interface = { + /*.interface_name */ "rss", + /*.application_function */ rss_function, + NULL, NULL, NULL, + /*.next*/ NULL +}; + + +static switch_loadable_module_interface_t rss_module_interface = { + /*.module_name */ modname, + /*.endpoint_interface */ NULL, + /*.timer_interface */ NULL, + /*.dialplan_interface */ NULL, + /*.codec_interface */ NULL, + /*.application_interface */ &rss_application_interface, + /*.api_interface */ NULL, + /*.file_interface */ NULL, + /*.speech_interface */ NULL, + /*.directory_interface */ NULL +}; + + +SWITCH_MOD_DECLARE(switch_status_t) switch_module_load(const switch_loadable_module_interface_t **module_interface, char *filename) +{ + /* connect my internal structure to the blank pointer passed to me */ + *module_interface = &rss_module_interface; + + /* indicate that the module should continue to be loaded */ + return SWITCH_STATUS_SUCCESS; +} +

1 0

[commit] r1573 - in freeswitch/trunk/src: . include mod/applications/mod_rss mod/asr_tts/mod_cepstral mod/endpoints/mod_wanpipe
by anthm＠freeswitch.org 08 Jun '06

08 Jun '06

Author: anthm Date: Thu Jun 8 15:22:54 2006 New Revision: 1573 Removed: freeswitch/trunk/src/mod/applications/mod_rss/ Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c Log: ivr stuff (part 1) Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Thu Jun 8 15:22:54 2006 @@ -918,6 +918,14 @@ SWITCH_DECLARE(void) switch_core_speech_numeric_param_tts(switch_speech_handle_t *sh, char *param, int val); /*! + \brief Set a float parameter on a TTS handle + \param sh the speech handle + \param param the parameter + \param val the value +*/ +SWITCH_DECLARE(void) switch_core_speech_float_param_tts(switch_speech_handle_t *sh, char *param, double val); + +/*! \brief Read rendered audio from the TTS module \param sh the speech handle to read \param data the buffer to read to Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Thu Jun 8 15:22:54 2006 @@ -330,6 +330,7 @@ void (*speech_flush_tts)(switch_speech_handle_t *sh); void (*speech_text_param_tts)(switch_speech_handle_t *sh, char *param, char *val); void (*speech_numeric_param_tts)(switch_speech_handle_t *sh, char *param, int val); + void (*speech_float_param_tts)(switch_speech_handle_t *sh, char *param, double val); const struct switch_speech_interface *next; }; @@ -345,6 +346,9 @@ char *name; /*! The Rate*/ uint32_t rate; + uint32_t speed; + char voice[80]; + char engine[80]; /*! the handle's memory pool */ switch_memory_pool_t *memory_pool; /*! private data for the format module to store handle specific info */ Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Thu Jun 8 15:22:54 2006 @@ -424,6 +424,7 @@ SWITCH_SPEECH_FLAG_PEEK = (1 << 3) - Read data but do not erase it. SWITCH_SPEECH_FLAG_FREE_POOL = (1 << 4) - Free interface's pool on destruction. SWITCH_SPEECH_FLAG_BLOCKING = (1 << 5) - Indicate that a blocking call is desired +SWITCH_SPEECH_FLAG_PAUSE = (1 << 6) - Pause toggle for playback </pre> */ typedef enum { @@ -433,6 +434,7 @@ SWITCH_SPEECH_FLAG_PEEK = (1 << 3), SWITCH_SPEECH_FLAG_FREE_POOL = (1 << 4), SWITCH_SPEECH_FLAG_BLOCKING = (1 << 5), + SWITCH_SPEECH_FLAG_PAUSE = (1 << 6) } switch_speech_flag_t; Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Thu Jun 8 15:22:54 2006 @@ -36,7 +36,7 @@ #include <swift.h> #include <switch.h> -#define MY_BUF_LEN 1024 * 512 +#define MY_BUF_LEN 1024 * 256 static const char modname[] = "mod_cepstral"; @@ -152,8 +152,14 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to set voice.\n"); goto all_done; } + + voice_name = (char *) swift_voice_get_attribute(cepstral->voice, "name"); } + if (voice_name) { + switch_copy_string(sh->voice, voice_name, sizeof(sh->voice)); + } + swift_port_set_callback(cepstral->port, &write_audio, SWIFT_EVENT_AUDIO, cepstral); sh->private_info = cepstral; @@ -175,7 +181,6 @@ cepstral->done = 1; cepstral->done_gen = 1; - printf("CLOSE!!!\n"); swift_port_stop(cepstral->port, SWIFT_ASYNC_ANY, SWIFT_EVENT_NOW); /* Close the Swift Port and Engine */ if (NULL != cepstral->port) swift_port_close(cepstral->port); @@ -294,6 +299,83 @@ return status; } +static void cepstral_text_param_tts(switch_speech_handle_t *sh, char *param, char *val) +{ + cepstral_t *cepstral; + + cepstral = sh->private_info; + assert(cepstral != NULL); + + if (!strcasecmp(param, "voice")) { + char *voice_name = val; + if (!strcasecmp(voice_name, "next")) { + if ((cepstral->voice = swift_port_find_next_voice(cepstral->port))) { + if ( SWIFT_FAILED(swift_port_set_voice(cepstral->port, cepstral->voice)) ) { + cepstral->done = cepstral->done_gen = 1; + return; + } + voice_name = (char *) swift_voice_get_attribute(cepstral->voice, "name"); + } else { + voice_name = NULL; + } + } else { + if (voice_name && SWIFT_FAILED(swift_port_set_voice_by_name(cepstral->port, voice_name))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid voice %s!\n", voice_name); + voice_name = NULL; + } + } + + if (!voice_name) { + /* Find the first voice on the system */ + if ((cepstral->voice = swift_port_find_first_voice(cepstral->port, NULL, NULL)) == NULL) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to find any voices!\n"); + cepstral->done = cepstral->done_gen = 1; + return; + } + + /* Set the voice found by find_first_voice() as the port's current voice */ + if ( SWIFT_FAILED(swift_port_set_voice(cepstral->port, cepstral->voice)) ) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to set voice.\n"); + cepstral->done = cepstral->done_gen = 1; + return; + } + + voice_name = (char *) swift_voice_get_attribute(cepstral->voice, "name"); + } + + if (voice_name) { + switch_copy_string(sh->voice, voice_name, sizeof(sh->voice)); + } + + return; + } + + swift_port_set_param_string(cepstral->port, param, val, NULL); +} + +static void cepstral_numeric_param_tts(switch_speech_handle_t *sh, char *param, int val) +{ + cepstral_t *cepstral; + + cepstral = sh->private_info; + assert(cepstral != NULL); + + swift_port_set_param_int(cepstral->port, param, val, NULL); + +} + + +static void cepstral_float_param_tts(switch_speech_handle_t *sh, char *param, double val) +{ + cepstral_t *cepstral; + + cepstral = sh->private_info; + assert(cepstral != NULL); + + swift_port_set_param_float(cepstral->port, param, val, NULL); + +} + static const switch_speech_interface_t cepstral_speech_interface = { /*.interface_name*/ "cepstral", /*.speech_open*/ cepstral_speech_open, @@ -302,7 +384,10 @@ /*.speech_interpret_asr*/ NULL, /*.speech_feed_tts*/ cepstral_speech_feed_tts, /*.speech_read_tts*/ cepstral_speech_read_tts, - /*.speech_flush_tts*/ cepstral_speech_flush_tts + /*.speech_flush_tts*/ cepstral_speech_flush_tts, + /*.speech_text_param_tts*/ cepstral_text_param_tts, + /*.speech_numeric_param_tts*/ cepstral_numeric_param_tts, + /*.speech_numeric_param_tts*/ cepstral_float_param_tts }; static const switch_loadable_module_interface_t cepstral_module_interface = { Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/mod_wanpipe.c Thu Jun 8 15:22:54 2006 @@ -566,8 +566,8 @@ while (bytes > 0) { unsigned int towrite; -#if 0 - if (sangoma_socket_waitfor(tech_pvt->socket, -1, POLLOUT | POLLERR | POLLHUP) <= 0) { +#if 1 + if (sangoma_socket_waitfor(tech_pvt->socket, 1000, POLLOUT | POLLERR | POLLHUP) <= 0) { return SWITCH_STATUS_GENERR; } #endif Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Thu Jun 8 15:22:54 2006 @@ -578,6 +578,7 @@ return SWITCH_STATUS_GENERR; } + switch_copy_string(sh->engine, module_name, sizeof(sh->engine)); sh->flags = *flags; if (pool) { sh->memory_pool = pool; @@ -640,6 +641,15 @@ } } +SWITCH_DECLARE(void) switch_core_speech_float_param_tts(switch_speech_handle_t *sh, char *param, double val) +{ + assert(sh != NULL); + + if (sh->speech_interface->speech_float_param_tts) { + sh->speech_interface->speech_float_param_tts(sh, param, val); + } +} + SWITCH_DECLARE(switch_status_t) switch_core_speech_read_tts(switch_speech_handle_t *sh, void *data, switch_size_t *datalen, @@ -736,15 +746,13 @@ while (data->running > 0) { switch (switch_core_session_read_frame(session, &read_frame, -1, stream_id)) { case SWITCH_STATUS_SUCCESS: - break; case SWITCH_STATUS_TIMEOUT: + case SWITCH_STATUS_BREAK: break; default: data->running = -1; continue; } - - switch_yield(10000); } data->running = 0; Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Thu Jun 8 15:22:54 2006 @@ -554,6 +554,52 @@ ilen = len; while(switch_channel_ready(channel)) { + + if (dtmf_callback || buf) { + /* + dtmf handler function you can hook up to be executed when a digit is dialed during playback + if you return anything but SWITCH_STATUS_SUCCESS the playback will stop. + */ + if (switch_channel_has_dtmf(channel)) { + if (buf && !strcasecmp(buf, "_break_")) { + status = SWITCH_STATUS_BREAK; + } else { + switch_channel_dequeue_dtmf(channel, dtmf, sizeof(dtmf)); + if (dtmf_callback) { + status = dtmf_callback(session, dtmf, buf, buflen); + } else { + switch_copy_string((char *)buf, dtmf, buflen); + status = SWITCH_STATUS_BREAK; + } + } + } + + if (status != SWITCH_STATUS_SUCCESS) { + done = 1; + break; + } + } + + if (switch_test_flag(sh, SWITCH_SPEECH_FLAG_PAUSE)) { + if (timer) { + if ((x = switch_core_timer_next(timer)) < 0) { + break; + } + } else { + switch_frame_t *read_frame; + switch_status_t status = switch_core_session_read_frame(session, &read_frame, -1, 0); + + while (switch_channel_test_flag(channel, CF_HOLD)) { + switch_yield(10000); + } + + if (!SWITCH_READ_ACCEPTABLE(status)) { + break; + } + } + continue; + } + flags = SWITCH_SPEECH_FLAG_BLOCKING; status = switch_core_speech_read_tts(sh, abuf, @@ -596,27 +642,6 @@ } } - if (dtmf_callback || buf) { - /* - dtmf handler function you can hook up to be executed when a digit is dialed during playback - if you return anything but SWITCH_STATUS_SUCCESS the playback will stop. - */ - if (switch_channel_has_dtmf(channel)) { - switch_channel_dequeue_dtmf(channel, dtmf, sizeof(dtmf)); - if (dtmf_callback) { - status = dtmf_callback(session, dtmf, buf, buflen); - } else { - switch_copy_string((char *)buf, dtmf, buflen); - status = SWITCH_STATUS_BREAK; - } - } - - if (status != SWITCH_STATUS_SUCCESS) { - done = 1; - break; - } - } - if (timer) { if ((x = switch_core_timer_next(timer)) < 0) { break;

1 0

[commit] r1572 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by mikej＠freeswitch.org 08 Jun '06

08 Jun '06

Author: mikej Date: Thu Jun 8 11:28:42 2006 New Revision: 1572 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: add early audio message hook. Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Thu Jun 8 11:28:42 2006 @@ -430,6 +430,7 @@ default: break; } + return SWITCH_STATUS_SUCCESS; } @@ -485,7 +486,8 @@ /*.kill_channel */ channel_kill_channel, /*.waitfor_read */ channel_waitfor_read, /*.waitfor_write */ channel_waitfor_write, - /*.send_dtmf */ channel_send_dtmf + /*.send_dtmf */ channel_send_dtmf, + /*.receive_message*/ channel_receive_message }; static const switch_endpoint_interface_t channel_endpoint_interface = {

1 0

[commit] r1571 - freeswitch/trunk/src/mod/endpoints/mod_portaudio
by anthm＠freeswitch.org 08 Jun '06

08 Jun '06

Author: anthm Date: Thu Jun 8 11:20:46 2006 New Revision: 1571 Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Log: yep Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c Thu Jun 8 11:20:46 2006 @@ -409,6 +409,29 @@ return SWITCH_STATUS_SUCCESS; } +static switch_status_t channel_receive_message(switch_core_session_t *session, switch_core_session_message_t *msg) +{ + switch_channel_t *channel; + struct private_object *tech_pvt; + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + tech_pvt = switch_core_session_get_private(session); + assert(tech_pvt != NULL); + + + switch (msg->message_id) { + case SWITCH_MESSAGE_INDICATE_PROGRESS: + { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Engage Early Media\n"); + switch_set_flag(tech_pvt, TFLAG_IO); + } + default: + break; + } +} + static switch_api_interface_t send_dtmf_interface = { /*.interface_name */ "padtmf",

1 0

[commit] r1569 - in freeswitch/trunk/src: . include mod/asr_tts/mod_cepstral
by anthm＠freeswitch.org 08 Jun '06

08 Jun '06

Author: anthm Date: Wed Jun 7 21:58:37 2006 New Revision: 1569 Modified: freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/include/switch_module_interfaces.h freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c freeswitch/trunk/src/switch_core.c freeswitch/trunk/src/switch_ivr.c Log: ivr stuff Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Wed Jun 7 21:58:37 2006 @@ -896,6 +896,28 @@ SWITCH_DECLARE(switch_status_t) switch_core_speech_feed_tts(switch_speech_handle_t *sh, char *text, switch_speech_flag_t *flags); /*! + \brief Flush TTS audio on a given handle + \param sh the speech handle +*/ +SWITCH_DECLARE(void) switch_core_speech_flush_tts(switch_speech_handle_t *sh); + +/*! + \brief Set a text parameter on a TTS handle + \param sh the speech handle + \param param the parameter + \param val the value +*/ +SWITCH_DECLARE(void) switch_core_speech_text_param_tts(switch_speech_handle_t *sh, char *param, char *val); + +/*! + \brief Set a numeric parameter on a TTS handle + \param sh the speech handle + \param param the parameter + \param val the value +*/ +SWITCH_DECLARE(void) switch_core_speech_numeric_param_tts(switch_speech_handle_t *sh, char *param, int val); + +/*! \brief Read rendered audio from the TTS module \param sh the speech handle to read \param data the buffer to read to Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Wed Jun 7 21:58:37 2006 @@ -125,6 +125,15 @@ unsigned int buflen); +SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text_handle(switch_core_session_t *session, + switch_speech_handle_t *sh, + switch_codec_t *codec, + switch_timer_t *timer, + switch_dtmf_callback_function_t dtmf_callback, + char *text, + void *buf, + unsigned int buflen); + /*! \brief Speak given text with given tts engine \param session the session to speak on @@ -139,14 +148,15 @@ \return SWITCH_STATUS_SUCCESS if all is well */ SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text(switch_core_session_t *session, - char *tts_name, - char *voice_name, - char *timer_name, - uint32_t rate, - switch_dtmf_callback_function_t dtmf_callback, - char *text, - void *buf, - unsigned int buflen); + char *tts_name, + char *voice_name, + char *timer_name, + uint32_t rate, + switch_dtmf_callback_function_t dtmf_callback, + char *text, + void *buf, + unsigned int buflen); + /*! \brief Bridge Audio from one session to another Modified: freeswitch/trunk/src/include/switch_module_interfaces.h ============================================================================== --- freeswitch/trunk/src/include/switch_module_interfaces.h (original) +++ freeswitch/trunk/src/include/switch_module_interfaces.h Wed Jun 7 21:58:37 2006 @@ -327,6 +327,9 @@ switch_size_t *datalen, uint32_t *rate, switch_speech_flag_t *flags); + void (*speech_flush_tts)(switch_speech_handle_t *sh); + void (*speech_text_param_tts)(switch_speech_handle_t *sh, char *param, char *val); + void (*speech_numeric_param_tts)(switch_speech_handle_t *sh, char *param, int val); const struct switch_speech_interface *next; }; @@ -338,7 +341,10 @@ const switch_speech_interface_t *speech_interface; /*! flags to control behaviour */ uint32_t flags; - + /*! The Name*/ + char *name; + /*! The Rate*/ + uint32_t rate; /*! the handle's memory pool */ switch_memory_pool_t *memory_pool; /*! private data for the format module to store handle specific info */ Modified: freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_cepstral/mod_cepstral.c Wed Jun 7 21:58:37 2006 @@ -36,6 +36,8 @@ #include <swift.h> #include <switch.h> +#define MY_BUF_LEN 1024 * 512 + static const char modname[] = "mod_cepstral"; static swift_engine *engine; @@ -59,23 +61,42 @@ cepstral_t *cepstral; swift_event_t rv = SWIFT_SUCCESS; void *buf = NULL; - int len = 0; + int len = 0, i = 0; cepstral = udata; assert(cepstral != NULL); + if (!cepstral->port || cepstral->done || cepstral->done_gen) { + return SWIFT_UNKNOWN_ERROR; + } + /* Only proceed when we have success */ if (!SWIFT_FAILED((rv = swift_event_get_audio(event, &buf, &len)))) { - switch_mutex_lock(cepstral->audio_lock); - - if (switch_buffer_write(cepstral->audio_buffer, buf, len) <= 0) { - rv = SWIFT_UNKNOWN_ERROR; + while(!cepstral->done) { + switch_mutex_lock(cepstral->audio_lock); + if (switch_buffer_write(cepstral->audio_buffer, buf, len) > 0) { + switch_mutex_unlock(cepstral->audio_lock); + break; + } + switch_mutex_unlock(cepstral->audio_lock); + if (!cepstral->done) { + for (i = 0; i < 10; i++) { + switch_yield(10000); + if (cepstral->done) { + break; + } + } + } + } - switch_mutex_unlock(cepstral->audio_lock); } else { cepstral->done = 1; } + if (cepstral->done) { + rv = SWIFT_UNKNOWN_ERROR; + } + return rv; } @@ -92,7 +113,7 @@ return SWITCH_STATUS_MEMERR; } - if (switch_buffer_create(sh->memory_pool, &cepstral->audio_buffer, 1024 * 256) != SWITCH_STATUS_SUCCESS) { + if (switch_buffer_create(sh->memory_pool, &cepstral->audio_buffer, MY_BUF_LEN) != SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Write Buffer Failed!\n"); return SWITCH_STATUS_MEMERR; } @@ -151,6 +172,11 @@ cepstral = sh->private_info; assert(cepstral != NULL); + + cepstral->done = 1; + cepstral->done_gen = 1; + printf("CLOSE!!!\n"); + swift_port_stop(cepstral->port, SWIFT_ASYNC_ANY, SWIFT_EVENT_NOW); /* Close the Swift Port and Engine */ if (NULL != cepstral->port) swift_port_close(cepstral->port); //if (NULL != cepstral->engine) swift_engine_close(cepstral->engine); @@ -169,13 +195,33 @@ cepstral = sh->private_info; assert(cepstral != NULL); + cepstral->done_gen = 0; + cepstral->done = 0; + + cepstral->tts_stream = NULL; + swift_port_speak_text(cepstral->port, text, 0, NULL, &cepstral->tts_stream, NULL); - //swift_port_speak_text(cepstral->port, text, 0, NULL, NULL, NULL); - return SWITCH_STATUS_FALSE; } +static void cepstral_speech_flush_tts(switch_speech_handle_t *sh) +{ + cepstral_t *cepstral; + + cepstral = sh->private_info; + assert(cepstral != NULL); + + cepstral->done_gen = 1; + cepstral->done = 1; + if (cepstral->audio_buffer) { + switch_mutex_lock(cepstral->audio_lock); + switch_buffer_zero(cepstral->audio_buffer); + switch_mutex_unlock(cepstral->audio_lock); + } + swift_port_stop(cepstral->port, SWIFT_ASYNC_ANY, SWIFT_EVENT_NOW); +} + static switch_status_t cepstral_speech_read_tts(switch_speech_handle_t *sh, void *data, size_t *datalen, @@ -193,18 +239,23 @@ while(!cepstral->done) { if (!cepstral->done_gen) { - int check = (SWIFT_STATUS_RUNNING == swift_port_status(cepstral->port, cepstral->tts_stream)); - if (!check) { + int check = swift_port_status(cepstral->port, cepstral->tts_stream); + + if (!check == SWIFT_STATUS_RUNNING) { cepstral->done_gen = 1; } } + switch_mutex_lock(cepstral->audio_lock); used = switch_buffer_inuse(cepstral->audio_buffer); - + switch_mutex_unlock(cepstral->audio_lock); + + if (!used && cepstral->done_gen) { + + status = SWITCH_STATUS_BREAK; break; } - /* wait for the right amount of data (unless there is no blocking flag) */ if (used < desired) { @@ -250,8 +301,8 @@ /*.speech_feed_asr*/ NULL, /*.speech_interpret_asr*/ NULL, /*.speech_feed_tts*/ cepstral_speech_feed_tts, - /*.speech_read_tts*/ cepstral_speech_read_tts - + /*.speech_read_tts*/ cepstral_speech_read_tts, + /*.speech_flush_tts*/ cepstral_speech_flush_tts }; static const switch_loadable_module_interface_t cepstral_module_interface = { Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Wed Jun 7 21:58:37 2006 @@ -565,11 +565,11 @@ } 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 *module_name, + char *voice_name, + unsigned int rate, + switch_speech_flag_t *flags, + switch_memory_pool_t *pool) { switch_status_t status; @@ -587,7 +587,8 @@ } 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); } @@ -610,6 +611,33 @@ assert(sh != NULL); return sh->speech_interface->speech_feed_tts(sh, text, flags); +} + +SWITCH_DECLARE(void) switch_core_speech_flush_tts(switch_speech_handle_t *sh) +{ + assert(sh != NULL); + + if (sh->speech_interface->speech_flush_tts) { + sh->speech_interface->speech_flush_tts(sh); + } +} + +SWITCH_DECLARE(void) switch_core_speech_text_param_tts(switch_speech_handle_t *sh, char *param, char *val) +{ + assert(sh != NULL); + + if (sh->speech_interface->speech_text_param_tts) { + sh->speech_interface->speech_text_param_tts(sh, param, val); + } +} + +SWITCH_DECLARE(void) switch_core_speech_numeric_param_tts(switch_speech_handle_t *sh, char *param, int val) +{ + assert(sh != NULL); + + if (sh->speech_interface->speech_numeric_param_tts) { + sh->speech_interface->speech_numeric_param_tts(sh, param, val); + } } SWITCH_DECLARE(switch_status_t) switch_core_speech_read_tts(switch_speech_handle_t *sh, Modified: freeswitch/trunk/src/switch_ivr.c ============================================================================== --- freeswitch/trunk/src/switch_ivr.c (original) +++ freeswitch/trunk/src/switch_ivr.c Wed Jun 7 21:58:37 2006 @@ -495,107 +495,53 @@ -SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text(switch_core_session_t *session, - char *tts_name, - char *voice_name, - char *timer_name, - uint32_t rate, - switch_dtmf_callback_function_t dtmf_callback, - char *text, - void *buf, - unsigned int buflen) +SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text_handle(switch_core_session_t *session, + switch_speech_handle_t *sh, + switch_codec_t *codec, + switch_timer_t *timer, + switch_dtmf_callback_function_t dtmf_callback, + char *text, + void *buf, + unsigned int buflen) { switch_channel_t *channel; short abuf[960]; char dtmf[128]; - int interval = 0; - uint32_t samples = 0; uint32_t len = 0; switch_size_t ilen = 0; switch_frame_t write_frame = {0}; - switch_timer_t timer; - switch_core_thread_session_t thread_session; - switch_codec_t codec; - switch_memory_pool_t *pool = switch_core_session_get_pool(session); - char *codec_name; int x; int stream_id; int done = 0; int lead_in_out = 10; - switch_status_t status = SWITCH_STATUS_SUCCESS; - switch_speech_handle_t sh; switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_TTS; + uint32_t rate = 0, samples = 0; - - memset(&sh, 0, sizeof(sh)); - channel = switch_core_session_get_channel(session); assert(channel != NULL); - if (switch_core_speech_open(&sh, - tts_name, - voice_name, - (unsigned int)rate, - &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); + if (!sh) { return SWITCH_STATUS_FALSE; } - + switch_channel_answer(channel); write_frame.data = abuf; write_frame.buflen = sizeof(abuf); + samples = (uint32_t)(sh->rate / 50); + len = samples * 2; - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "OPEN TTS %s\n", tts_name); - - interval = 20; - samples = (uint32_t)(rate / 50); - len = samples * 2; - - codec_name = "L16"; - - if (switch_core_codec_init(&codec, - codec_name, - (int)rate, - interval, - 1, - SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, - NULL, pool) == SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activated\n"); - write_frame.codec = &codec; - } else { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed %s@%uhz 1 channel %dms\n", - codec_name, rate, interval); - flags = 0; - switch_core_speech_close(&sh, &flags); - switch_core_session_reset(session); - return SWITCH_STATUS_GENERR; - } - - if (timer_name) { - if (switch_core_timer_init(&timer, timer_name, interval, (int)samples, pool) != SWITCH_STATUS_SUCCESS) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n"); - switch_core_codec_destroy(&codec); - flags = 0; - switch_core_speech_close(&sh, &flags); - 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); - } - flags = 0; - switch_core_speech_feed_tts(&sh, text, &flags); - write_frame.rate = rate; + switch_core_speech_feed_tts(sh, text, &flags); + write_frame.rate = sh->rate; memset(write_frame.data, 0, len); write_frame.datalen = len; write_frame.samples = len / 2; - + write_frame.codec = codec; + for( x = 0; !done && x < lead_in_out; x++) { for (stream_id = 0; stream_id < switch_core_session_get_stream_count(session); stream_id++) { if (switch_core_session_write_frame(session, &write_frame, -1, stream_id) != SWITCH_STATUS_SUCCESS) { @@ -606,40 +552,10 @@ } } - if (timer_name) { - /* start a thread to absorb incoming audio */ - for (stream_id = 0; stream_id < switch_core_session_get_stream_count(session); stream_id++) { - switch_core_service_session(session, &thread_session, stream_id); - } - } - ilen = len; while(switch_channel_ready(channel)) { - if (dtmf_callback || buf) { - - - /* - dtmf handler function you can hook up to be executed when a digit is dialed during playback - if you return anything but SWITCH_STATUS_SUCCESS the playback will stop. - */ - if (switch_channel_has_dtmf(channel)) { - switch_channel_dequeue_dtmf(channel, dtmf, sizeof(dtmf)); - if (dtmf_callback) { - status = dtmf_callback(session, dtmf, buf, buflen); - } else { - switch_copy_string((char *)buf, dtmf, buflen); - status = SWITCH_STATUS_BREAK; - } - } - - if (status != SWITCH_STATUS_SUCCESS) { - done = 1; - break; - } - } - flags = SWITCH_SPEECH_FLAG_BLOCKING; - status = switch_core_speech_read_tts(&sh, + status = switch_core_speech_read_tts(sh, abuf, &ilen, &rate, @@ -655,10 +571,13 @@ } } } + if (status == SWITCH_STATUS_BREAK) { + status = SWITCH_STATUS_SUCCESS; + } done = 1; } - if (done || ilen <= 0) { + if (done) { break; } @@ -676,10 +595,32 @@ break; } } - if (timer_name) { - if ((x = switch_core_timer_next(&timer)) < 0) { + + if (dtmf_callback || buf) { + /* + dtmf handler function you can hook up to be executed when a digit is dialed during playback + if you return anything but SWITCH_STATUS_SUCCESS the playback will stop. + */ + if (switch_channel_has_dtmf(channel)) { + switch_channel_dequeue_dtmf(channel, dtmf, sizeof(dtmf)); + if (dtmf_callback) { + status = dtmf_callback(session, dtmf, buf, buflen); + } else { + switch_copy_string((char *)buf, dtmf, buflen); + status = SWITCH_STATUS_BREAK; + } + } + + if (status != SWITCH_STATUS_SUCCESS) { + done = 1; break; } + } + + if (timer) { + if ((x = switch_core_timer_next(timer)) < 0) { + break; + } } else { /* time off the channel (if you must) */ switch_frame_t *read_frame; switch_status_t status = switch_core_session_read_frame(session, &read_frame, -1, 0); @@ -692,9 +633,105 @@ break; } } - } + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "done speaking text\n"); + flags = 0; + switch_core_speech_flush_tts(sh); + return status; +} + + +SWITCH_DECLARE(switch_status_t) switch_ivr_speak_text(switch_core_session_t *session, + char *tts_name, + char *voice_name, + char *timer_name, + uint32_t rate, + switch_dtmf_callback_function_t dtmf_callback, + char *text, + void *buf, + unsigned int buflen) +{ + switch_channel_t *channel; + int interval = 0; + uint32_t samples = 0; + uint32_t len = 0; + switch_frame_t write_frame = {0}; + switch_timer_t timer; + switch_core_thread_session_t thread_session; + switch_codec_t codec; + switch_memory_pool_t *pool = switch_core_session_get_pool(session); + char *codec_name; + int stream_id; + switch_status_t status = SWITCH_STATUS_SUCCESS; + switch_speech_handle_t sh; + switch_speech_flag_t flags = SWITCH_SPEECH_FLAG_TTS; + + + channel = switch_core_session_get_channel(session); + assert(channel != NULL); + + + memset(&sh, 0, sizeof(sh)); + if (switch_core_speech_open(&sh, + tts_name, + voice_name, + (unsigned int)rate, + &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; + } + + switch_channel_answer(channel); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "OPEN TTS %s\n", tts_name); + + interval = 20; + samples = (uint32_t)(rate / 50); + len = samples * 2; + + codec_name = "L16"; + + if (switch_core_codec_init(&codec, + codec_name, + (int)rate, + interval, + 1, + SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, + NULL, pool) == SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activated\n"); + write_frame.codec = &codec; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed %s@%uhz 1 channel %dms\n", + codec_name, rate, interval); + flags = 0; + switch_core_speech_close(&sh, &flags); + switch_core_session_reset(session); + return SWITCH_STATUS_GENERR; + } + + if (timer_name) { + if (switch_core_timer_init(&timer, timer_name, interval, (int)samples, pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "setup timer failed!\n"); + switch_core_codec_destroy(&codec); + flags = 0; + switch_core_speech_close(&sh, &flags); + + 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); + + /* start a thread to absorb incoming audio */ + for (stream_id = 0; stream_id < switch_core_session_get_stream_count(session); stream_id++) { + switch_core_service_session(session, &thread_session, stream_id); + } + } + + switch_ivr_speak_text_handle(session, &sh, &codec, timer_name ? &timer : NULL, dtmf_callback, text, buf, buflen); flags = 0; switch_core_speech_close(&sh, &flags); switch_core_codec_destroy(&codec);

1 0

[commit] r1568 - in freeswitch/trunk: . src/include w32/vsnet
by mikej＠freeswitch.org 08 Jun '06

08 Jun '06

Author: mikej Date: Wed Jun 7 20:28:36 2006 New Revision: 1568 Modified: freeswitch/trunk/src/include/ (props changed) freeswitch/trunk/w32/vsnet/ (props changed) Changes in other areas also in this revision: Modified: freeswitch/trunk/ (props changed) Log: Add more build files to the ignore list. Diffs of changes in other areas also in this revision:

1 0

[commit] r1567 - in freeswitch/trunk/libs: libspeakup srtp/crypto srtp/crypto/test srtp/test
by mikej＠freeswitch.org 08 Jun '06

08 Jun '06

Author: mikej Date: Wed Jun 7 20:25:00 2006 New Revision: 1567 Modified: freeswitch/trunk/libs/libspeakup/ (props changed) freeswitch/trunk/libs/srtp/crypto/ (props changed) freeswitch/trunk/libs/srtp/crypto/test/ (props changed) freeswitch/trunk/libs/srtp/test/ (props changed) Log: Add more build files to the ignore list.

1 0

[commit] r1566 - in freeswitch/trunk: . build libs libs/iax/src libs/libspeakup src/include
by mikej＠freeswitch.org 08 Jun '06

08 Jun '06

Author: mikej Date: Wed Jun 7 20:15:48 2006 New Revision: 1566 Modified: freeswitch/trunk/build/ (props changed) freeswitch/trunk/libs/ (props changed) freeswitch/trunk/libs/iax/src/ (props changed) freeswitch/trunk/libs/libspeakup/ (props changed) freeswitch/trunk/src/include/ (props changed) Changes in other areas also in this revision: Modified: freeswitch/trunk/ (props changed) Log: Add more build files to the ignore list. Diffs of changes in other areas also in this revision:

1 0

[commit] r1565 - in freeswitch/trunk/src/mod: . applications applications/mod_bridgecall applications/mod_commands applications/mod_echo applications/mod_ivrtest applications/mod_playback applications/mod_rss applications/mod_skel asr_tts asr_tts/mod_cepstral codecs codecs/mod_g711 codecs/mod_g729 codecs/mod_gsm codecs/mod_ilbc codecs/mod_l16 codecs/mod_speex dialplans dialplans/mod_dialplan_directory dialplans/mod_dialplan_xml directories directories/mod_ldap endpoints endpoints/mod_ding
by mikej＠freeswitch.org 07 Jun '06

07 Jun '06

Author: mikej Date: Wed Jun 7 19:55:26 2006 New Revision: 1565 Modified: freeswitch/trunk/src/mod/ (props changed) freeswitch/trunk/src/mod/applications/ (props changed) freeswitch/trunk/src/mod/applications/mod_bridgecall/ (props changed) freeswitch/trunk/src/mod/applications/mod_commands/ (props changed) freeswitch/trunk/src/mod/applications/mod_echo/ (props changed) freeswitch/trunk/src/mod/applications/mod_ivrtest/ (props changed) freeswitch/trunk/src/mod/applications/mod_playback/ (props changed) freeswitch/trunk/src/mod/applications/mod_rss/ (props changed) freeswitch/trunk/src/mod/applications/mod_skel/ (props changed) freeswitch/trunk/src/mod/asr_tts/ (props changed) freeswitch/trunk/src/mod/asr_tts/mod_cepstral/ (props changed) freeswitch/trunk/src/mod/codecs/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g711/ (props changed) freeswitch/trunk/src/mod/codecs/mod_g729/ (props changed) freeswitch/trunk/src/mod/codecs/mod_gsm/ (props changed) freeswitch/trunk/src/mod/codecs/mod_ilbc/ (props changed) freeswitch/trunk/src/mod/codecs/mod_l16/ (props changed) freeswitch/trunk/src/mod/codecs/mod_speex/ (props changed) freeswitch/trunk/src/mod/dialplans/ (props changed) freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/ (props changed) freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/ (props changed) freeswitch/trunk/src/mod/directories/ (props changed) freeswitch/trunk/src/mod/directories/mod_ldap/ (props changed) freeswitch/trunk/src/mod/endpoints/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_dingaling/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_exosip/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_iax/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_portaudio/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_wanpipe/ (props changed) freeswitch/trunk/src/mod/endpoints/mod_woomera/ (props changed) freeswitch/trunk/src/mod/event_handlers/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_event_multicast/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_event_test/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_xmpp_event/ (props changed) freeswitch/trunk/src/mod/event_handlers/mod_zeroconf/ (props changed) freeswitch/trunk/src/mod/formats/ (props changed) freeswitch/trunk/src/mod/formats/mod_sndfile/ (props changed) freeswitch/trunk/src/mod/languages/ (props changed) freeswitch/trunk/src/mod/languages/mod_perl/ (props changed) freeswitch/trunk/src/mod/languages/mod_spidermonkey/ (props changed) freeswitch/trunk/src/mod/loggers/ (props changed) freeswitch/trunk/src/mod/loggers/mod_console/ (props changed) freeswitch/trunk/src/mod/loggers/mod_syslog/ (props changed) freeswitch/trunk/src/mod/timers/ (props changed) freeswitch/trunk/src/mod/timers/mod_softtimer/ (props changed) freeswitch/trunk/src/mod/xml_int/ (props changed) freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/ (props changed) Log: Add more build files to the ignore list.

1 0