July 2008 - Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r8959 - freeswitch/trunk/src/mod/asr_tts/mod_flite
by Freeswitch SVN 09 Jul '08

09 Jul '08

Author: brian Date: Wed Jul 9 13:44:35 2008 New Revision: 8959 Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.c Log: tweaks Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_flite/Makefile Wed Jul 9 13:44:35 2008 @@ -3,7 +3,7 @@ FLITE_LIBDIR=$(FLITE_DIR)/build/libs FLITE_A=$(FLITE_LIBDIR)/libflite_cmu_us_kal.a $(FLITE_LIBDIR)/libflite_cmu_us_kal16.a $(FLITE_LIBDIR)/libflite_cmulex.a $(FLITE_LIBDIR)/libflite_usenglish.a $(FLITE_LIBDIR)/libflite.a -LOCAL_CFLAGS= +LOCAL_CFLAGS=-I$(switch_srcdir)/libs/$(FLITE)/include LOCAL_LIBADD=$(FLITE_A) -lm BASE=../../../.. Modified: freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_flite/mod_flite.c Wed Jul 9 13:44:35 2008 @@ -32,7 +32,7 @@ */ #include <switch.h> -#include <flite/flite.h> +#include <flite.h> cst_voice *register_cmu_us_kal(void); void unregister_cmu_us_kal(cst_voice * v);

1 0

[commit] r8958 - in freeswitch/trunk/src: . include include/private
by Freeswitch SVN 09 Jul '08

09 Jul '08

Author: anthm Date: Wed Jul 9 12:44:19 2008 New Revision: 8958 Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h freeswitch/trunk/src/include/switch_core.h freeswitch/trunk/src/switch_core_codec.c Log: make codec pointers more reliable Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h ============================================================================== --- freeswitch/trunk/src/include/private/switch_core_pvt.h (original) +++ freeswitch/trunk/src/include/private/switch_core_pvt.h Wed Jul 9 12:44:19 2008 @@ -105,7 +105,9 @@ switch_io_event_hooks_t event_hooks; switch_codec_t *read_codec; + switch_codec_t *real_read_codec; switch_codec_t *write_codec; + switch_codec_t *real_write_codec; switch_codec_t *video_read_codec; switch_codec_t *video_write_codec; Modified: freeswitch/trunk/src/include/switch_core.h ============================================================================== --- freeswitch/trunk/src/include/switch_core.h (original) +++ freeswitch/trunk/src/include/switch_core.h Wed Jul 9 12:44:19 2008 @@ -1130,6 +1130,13 @@ SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_read_codec(_In_ switch_core_session_t *session); /*! + \brief Retrieve the effevtive read codec from a given session + \param session session to retrieve from + \return a pointer to the codec +*/ +SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_effective_read_codec(_In_ switch_core_session_t *session); + +/*! \brief Assign the write codec to a given session \param session session to add the codec to \param codec the codec to add @@ -1145,6 +1152,13 @@ SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_write_codec(_In_ switch_core_session_t *session); /*! + \brief Retrieve the effevtive write codec from a given session + \param session session to retrieve from + \return a pointer to the codec +*/ +SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_effective_write_codec(_In_ switch_core_session_t *session); + +/*! \brief Assign the video_read codec to a given session \param session session to add the codec to \param codec the codec to add Modified: freeswitch/trunk/src/switch_core_codec.c ============================================================================== --- freeswitch/trunk/src/switch_core_codec.c (original) +++ freeswitch/trunk/src/switch_core_codec.c Wed Jul 9 12:44:19 2008 @@ -49,7 +49,30 @@ switch_channel_t *channel = switch_core_session_get_channel(session); char tmp[30]; - switch_assert(codec->implementation); + if (!codec || !codec->implementation) { + if (session->real_read_codec) { + session->read_codec = session->real_read_codec; + session->real_read_codec = NULL; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set NULL codec!\n"); + return SWITCH_STATUS_FALSE; + } + } else if (session->read_codec) { + if (session->real_read_codec) { + if (codec == session->real_read_codec) { + session->read_codec = codec; + session->real_read_codec = NULL; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot double-set codec!\n"); + return SWITCH_STATUS_FALSE; + } + } else { + session->real_read_codec = session->read_codec; + session->read_codec = codec; + } + } else { + session->read_codec = codec; + } if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(session->channel, event); @@ -65,7 +88,7 @@ switch_snprintf(tmp, sizeof(tmp), "%d", codec->implementation->actual_samples_per_second); switch_channel_set_variable(channel, "read_rate", tmp); - session->read_codec = codec; + session->raw_read_frame.codec = session->read_codec; session->raw_write_frame.codec = session->read_codec; session->enc_read_frame.codec = session->read_codec; @@ -74,18 +97,46 @@ return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_read_codec(switch_core_session_t *session) +SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_effective_read_codec(switch_core_session_t *session) { return session->read_codec; } +SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_read_codec(switch_core_session_t *session) +{ + return session->real_read_codec ? session->real_read_codec : session->read_codec; +} + SWITCH_DECLARE(switch_status_t) switch_core_session_set_write_codec(switch_core_session_t *session, switch_codec_t *codec) { switch_event_t *event; switch_channel_t *channel = switch_core_session_get_channel(session); char tmp[30]; - switch_assert(codec->implementation); + if (!codec || !codec->implementation) { + if (session->real_write_codec) { + session->write_codec = session->real_write_codec; + session->real_write_codec = NULL; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set NULL codec!\n"); + return SWITCH_STATUS_FALSE; + } + } else if (session->write_codec) { + if (session->real_write_codec) { + if (codec == session->real_write_codec) { + session->write_codec = codec; + session->real_write_codec = NULL; + } else { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot double-set codec!\n"); + return SWITCH_STATUS_FALSE; + } + } else { + session->real_write_codec = session->write_codec; + session->write_codec = codec; + } + } else { + session->write_codec = codec; + } if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(session->channel, event); @@ -102,15 +153,20 @@ switch_snprintf(tmp, sizeof(tmp), "%d", codec->implementation->actual_samples_per_second); switch_channel_set_variable(channel, "write_rate", tmp); - session->write_codec = codec; return SWITCH_STATUS_SUCCESS; } -SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_write_codec(switch_core_session_t *session) + +SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_effective_write_codec(switch_core_session_t *session) { return session->write_codec; } +SWITCH_DECLARE(switch_codec_t *) switch_core_session_get_write_codec(switch_core_session_t *session) +{ + return session->real_write_codec ? session->real_write_codec : session->write_codec; +} + SWITCH_DECLARE(switch_status_t) switch_core_session_set_video_read_codec(switch_core_session_t *session, switch_codec_t *codec)

1 0

[commit] r8957 - freeswitch/trunk/scripts
by Freeswitch SVN 09 Jul '08

09 Jul '08

Author: brian Date: Wed Jul 9 12:24:58 2008 New Revision: 8957 Added: freeswitch/trunk/scripts/ps_pizza.js Log: add pocketsphinx pizza.js demo Added: freeswitch/trunk/scripts/ps_pizza.js ============================================================================== --- (empty file) +++ freeswitch/trunk/scripts/ps_pizza.js Wed Jul 9 12:24:58 2008 @@ -0,0 +1,358 @@ +/* + * 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> + * + * + * pizza.js ASR Demonstration Application + * + */ +include("js_modules/SpeechTools.jm"); + +function on_dtmf(a, b, c) {} + +var dft_min = 100; +var dft_confirm = 600; + +/***************** Initialize The Speech Detector *****************/ +var asr = new SpeechDetect(session, "pocketsphinx"); + +/***************** Be more verbose *****************/ +asr.debug = 1; + +/***************** Set audio params *****************/ +asr.setAudioBase("/root/pizza/"); +asr.setAudioExt(".wav"); + +/***************** Unload the last grammar whenever we activate a new one *****************/ +asr.AutoUnload = true; + +/***************** Create And Configure The Pizza *****************/ +var pizza = new Object(); + +/***************** Delivery Or Take-Out? *****************/ +pizza.orderObtainer = new SpeechObtainer(asr, 1, 5000); +pizza.orderObtainer.setGrammar("pizza_order", "", "result", dft_min, dft_confirm, true); +pizza.orderObtainer.setTopSound("GP-DeliveryorTakeout"); +pizza.orderObtainer.setBadSound("GP-NoDeliveryorTake-out"); +pizza.orderObtainer.addItemAlias("Delivery", "Delivery"); +pizza.orderObtainer.addItemAlias("Takeout,Pickup", "Pickup"); + +/***************** What Size? *****************/ +pizza.sizeObtainer = new SpeechObtainer(asr, 1, 5000); +pizza.sizeObtainer.setGrammar("pizza_size", "", "result", dft_min, dft_confirm, true); +pizza.sizeObtainer.setTopSound("GP-Size"); +pizza.sizeObtainer.setBadSound("GP-NI"); +pizza.sizeObtainer.addItemAlias("^Extra\\s*Large", "ExtraLarge"); +pizza.sizeObtainer.addItemAlias("^Large$", "Large"); +pizza.sizeObtainer.addItemAlias("^Medium$", "Medium"); +pizza.sizeObtainer.addItemAlias("^Small$", "Small"); +pizza.sizeObtainer.addItemAlias("^Humongous$,^Huge$,^Totally\\s*Humongous$", "TotallyHumongous"); + +/***************** What Type Of Crust? *****************/ +pizza.crustObtainer = new SpeechObtainer(asr, 1, 5000); +pizza.crustObtainer.setGrammar("pizza_crust", "", "result", dft_min, dft_confirm, true); +pizza.crustObtainer.setTopSound("GP-Crust"); +pizza.crustObtainer.setBadSound("GP-NI"); +pizza.crustObtainer.addItemAlias("^Hand\\s*Tossed$,^Tossed$", "HandTossed"); +pizza.crustObtainer.addItemAlias("^Chicago\\s*style$,^Chicago$", "Pan"); +pizza.crustObtainer.addItemAlias("^Deep,^Pan", "Pan"); +pizza.crustObtainer.addItemAlias("^New\\s*York,^Thin", "Thin"); + +/***************** Specialty Or Custom? *****************/ +pizza.typeObtainer = new SpeechObtainer(asr, 1, 5000); +pizza.typeObtainer.setGrammar("pizza_type", "", "result", dft_min, dft_confirm, true); +pizza.typeObtainer.setTopSound("GP-SpecialtyorCustom"); +pizza.typeObtainer.setBadSound("GP-NI"); +pizza.typeObtainer.addItemAlias("^Specialty$,^Specialty\\s*pizza$", "Specialty"); +pizza.typeObtainer.addItemAlias("^pick\\s*my\\s*", "Custom"); + + +/***************** Which Specialty? *****************/ +pizza.specialtyObtainer = new SpeechObtainer(asr, 1, 5000); +pizza.specialtyObtainer.setGrammar("pizza_specialty", "", "result", dft_min, dft_confirm, true); +pizza.specialtyObtainer.setTopSound("GP-SpecialtyList"); +pizza.specialtyObtainer.setBadSound("GP-NI"); +pizza.specialtyObtainer.addItemAlias("^Hawaii,^Hawaiian", "Hawaiian"); +pizza.specialtyObtainer.addItemAlias("^Meat", "MeatLovers"); +pizza.specialtyObtainer.addItemAlias("Pickle,^World", "Pickle"); +pizza.specialtyObtainer.addItemAlias("^Salvador,^Dolly,^Dali", "Dali"); +pizza.specialtyObtainer.addItemAlias("^Veg", "Vegetarian"); + + +/***************** What Toppings? *****************/ +pizza.toppingsObtainer = new SpeechObtainer(asr, 1, 5000); +pizza.toppingsObtainer.setGrammar("pizza_toppings", "", "result", dft_min, 400, true); +pizza.toppingsObtainer.setTopSound("GP-Toppings"); +pizza.toppingsObtainer.setBadSound("GP-NI"); +pizza.toppingsObtainer.addItemAlias("anchovie,anchovies", "anchovie"); +pizza.toppingsObtainer.addItemAlias("artichoke,artichockes", "artichoke"); +pizza.toppingsObtainer.addItemAlias("canadian\\s*bacon", "canadianbacon"); +pizza.toppingsObtainer.addItemAlias("everything", "everything"); +pizza.toppingsObtainer.addItemAlias("extra\\s*cheese", "extracheese"); +pizza.toppingsObtainer.addItemAlias("garlic", "garlic"); +pizza.toppingsObtainer.addItemAlias("goat\\s*cheese", "goatcheese"); +pizza.toppingsObtainer.addItemAlias("bell\\s*pepper,bell\\s*peppers", "bellpepper"); +pizza.toppingsObtainer.addItemAlias("mango", "mango"); +pizza.toppingsObtainer.addItemAlias("mushroom,mushrooms", "mushroom"); +pizza.toppingsObtainer.addItemAlias("olives", "olives"); +pizza.toppingsObtainer.addItemAlias("onion,onions", "onions"); +pizza.toppingsObtainer.addItemAlias("pepperoni", "pepperoni"); +pizza.toppingsObtainer.addItemAlias("pickle,pickles", "pickle"); +pizza.toppingsObtainer.addItemAlias("pineapple", "pineapple"); +pizza.toppingsObtainer.addItemAlias("salami", "salami"); +pizza.toppingsObtainer.addItemAlias("sausage", "sausage"); +pizza.toppingsObtainer.addItemAlias("shrimp", "shrimp"); +pizza.toppingsObtainer.addItemAlias("spinich", "spinich"); +pizza.toppingsObtainer.addItemAlias("ham", "ham"); + +/***************** Change Delivery Or Size Or Crust, Add/Rem Toppings Or Start Over *****************/ +pizza.arsoObtainer = new SpeechObtainer(asr, 1, 5000); +pizza.arsoObtainer.setGrammar("pizza_arso", "", "result", 500, 250, true); +pizza.arsoObtainer.setTopSound("GP-ARSO"); +pizza.arsoObtainer.setBadSound("GP-NI"); +pizza.arsoObtainer.addItemAlias("^delivery$", "delivery"); +pizza.arsoObtainer.addItemAlias("^size$", "size"); +pizza.arsoObtainer.addItemAlias("^crust$", "crust"); +pizza.arsoObtainer.addItemAlias("^start\\s*over$", "startover"); +pizza.arsoObtainer.addItemAlias("^add\\s*", "add_topping"); +pizza.arsoObtainer.addItemAlias("^remove\\s*", "rem_topping"); + +/***************** Yes? No? Maybe So? *****************/ +pizza.yesnoObtainer = new SpeechObtainer(asr, 1, 5000); +pizza.yesnoObtainer.setGrammar("pizza_yesno", "", "result", 500, 250, true); +pizza.yesnoObtainer.setBadSound("GP-NI"); +pizza.yesnoObtainer.addItemAlias("^yes,^correct", "yes"); +pizza.yesnoObtainer.addItemAlias("^no", "no"); + +/***************** Get Some Information *****************/ +pizza.get = function(params, confirm) { + for(;;) { + if (!session.ready()) { + return false; + } + var main_items = params.run(); + if (confirm && params.needConfirm) { + pizza.yesnoObtainer.setTopSound("Confirm" + main_items[0]); + var items = pizza.yesnoObtainer.run(); + if (items[0] == "yes") { + break; + } + } else { + break; + } + } + + return main_items; +}; + +/***************** Is This Right? *****************/ +pizza.check = function () { + if (!session.ready()) { + return false; + } + asr.streamFile("GP-You_ordered_a"); + asr.streamFile(pizza.size); + asr.streamFile(pizza.crust); + if (pizza.type == "Specialty") { + asr.streamFile(pizza.specialty); + asr.streamFile("pizza"); + } else { + asr.streamFile("pizza"); + asr.streamFile("GP-With"); + for (key in pizza.toppings) { + if (pizza.toppings[key] == "add") { + asr.streamFile(key); + } + } + + } + + pizza.yesnoObtainer.setTopSound("GP-WasThisRight"); + items = pizza.yesnoObtainer.run(); + return items[0] == "yes" ? true : false; +}; + +/***************** Let's Remove The Toppings *****************/ +pizza.clearToppings = function() { + if (!session.ready()) { + return false; + } + if (pizza.toppings) { + delete pizza.toppings; + } + pizza.have_toppings = false; + pizza.toppings = new Array(); +} + +/***************** Clean Slate *****************/ +pizza.init = function() { + if (!session.ready()) { + return false; + } + pizza.add_rem = "add"; + pizza.order = pizza.size = pizza.crust = pizza.type = false; + pizza.toppingsObtainer.setTopSound("GP-Toppings"); + pizza.specialty = false; + pizza.clearToppings(); + pizza.said_greet = false; +} + +/***************** Welcome! *****************/ +pizza.greet = function () { + if (!session.ready()) { + return false; + } + if (!pizza.said_greet) { + asr.streamFile("GP-Greeting"); + pizza.said_greet = true; + } +}; + +/***************** Collect Order Type *****************/ +pizza.getOrder = function() { + if (!session.ready()) { + return false; + } + if (!pizza.order) { + var items = pizza.get(pizza.orderObtainer, true); + pizza.order = items[0]; + } +}; + +/***************** Collect Size *****************/ +pizza.getSize = function() { + if (!session.ready()) { + return false; + } + if (!pizza.size) { + var items = pizza.get(pizza.sizeObtainer, true); + pizza.size = items[0]; + } +}; + +/***************** Collect Crust *****************/ +pizza.getCrust = function() { + if (!session.ready()) { + return false; + } + if (!pizza.crust) { + var items = pizza.get(pizza.crustObtainer, true); + pizza.crust = items[0]; + } +}; + +/***************** Collect Pizza Type *****************/ +pizza.getType = function() { + if (!session.ready()) { + return false; + } + if (!pizza.type) { + var items = pizza.get(pizza.typeObtainer, true); + pizza.type = items[0]; + } +}; + +/***************** Collect Toppings *****************/ +pizza.getToppings = function() { + if (!session.ready()) { + return false; + } + if (pizza.type == "Specialty" && !pizza.specialty) { + var items = pizza.get(pizza.specialtyObtainer, true); + pizza.specialty = items[0]; + pizza.have_toppings = true; + } else if (!pizza.have_toppings) { + toppings = pizza.get(pizza.toppingsObtainer, false); + for(x = 0; x < toppings.length; x++) { + pizza.toppings[toppings[x]] = pizza.add_rem; + } + pizza.have_toppings = true; + } +}; + +/***************** Modify Pizza If You Don't Like It *****************/ +pizza.fix = function() { + if (!session.ready()) { + return false; + } + asr.streamFile("GP-Wanted-No"); + arso = pizza.get(pizza.arsoObtainer, false); + for (x = 0; x < arso.length; x++) { + if (arso[x] == "delivery") { + pizza.order = false; + } else if (arso[x] == "size") { + pizza.size = false; + } else if (arso[x] == "crust") { + pizza.crust = false; + } else if (arso[x] == "startover") { + pizza.init(); + } else { + if (pizza.type == "Specialty") { + asr.streamFile("GP-ChangeSpec"); + pizza.type = false; + pizza.clearToppings(); + } else { + pizza.have_toppings = false; + if (arso[x] == "add_topping") { + pizza.add_rem = "add"; + pizza.toppingsObtainer.setTopSound("GP-Adding"); + } else { + pizza.add_rem = "rem"; + pizza.toppingsObtainer.setTopSound("GP-Remove"); + } + } + } + } +}; + +/***************** Tie It All Together *****************/ +pizza.run = function() { + pizza.init(); + + for(;;) { + if (!session.ready()) { + break; + } + pizza.greet(); + pizza.getOrder(); + pizza.getSize(); + pizza.getCrust(); + pizza.getType(); + pizza.getToppings(); + + if (pizza.check()) { + asr.streamFile(pizza.order); + break; + } else { + pizza.fix(); + } + } +}; + +/***************** Begin Program *****************/ +session.answer(); +pizza.run(); +asr.stop();

1 0

[commit] r8956 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
by Freeswitch SVN 09 Jul '08

09 Jul '08

Author: brian Date: Wed Jul 9 12:15:21 2008 New Revision: 8956 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: tweaks to the recognizer from CMU Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Wed Jul 9 12:15:21 2008 @@ -131,6 +131,14 @@ "-hmm", model, "-lm", lm, "-dict", dic, + "-beam", "1e-60", + "-wbeam", "1e-40", + "-ci_pbeam", "1e-8", + "-subvqbeam", "1e-2", + "-maxhmmpf", "2000", + "-maxcdsenpf", "1000", + "-maxwpf", "8", + "-ds", "2", NULL); if (ps->config == NULL) {

1 0

[commit] r8955 - in freeswitch/trunk/src: . include
by Freeswitch SVN 09 Jul '08

09 Jul '08

Author: anthm Date: Wed Jul 9 12:03:03 2008 New Revision: 8955 Modified: freeswitch/trunk/src/include/switch_types.h freeswitch/trunk/src/switch_ivr_bridge.c Log: add copy_xml_cdr variable Modified: freeswitch/trunk/src/include/switch_types.h ============================================================================== --- freeswitch/trunk/src/include/switch_types.h (original) +++ freeswitch/trunk/src/include/switch_types.h Wed Jul 9 12:03:03 2008 @@ -100,6 +100,7 @@ #define SWITCH_PATH_SEPARATOR "/" #endif #define SWITCH_URL_SEPARATOR "://" +#define SWITCH_COPY_XML_CDR_VARIABLE "copy_xml_cdr" #define SWITCH_CURRENT_APPLICATION_VARIABLE "current_application" #define SWITCH_PROTO_SPECIFIC_HANGUP_CAUSE_VARIABLE "proto_specific_hangup_cause" #define SWITCH_CHANNEL_EXECUTE_ON_ANSWER_VARIABLE "execute_on_answer" Modified: freeswitch/trunk/src/switch_ivr_bridge.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_bridge.c (original) +++ freeswitch/trunk/src/switch_ivr_bridge.c Wed Jul 9 12:03:03 2008 @@ -382,6 +382,20 @@ switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING); } + if (switch_true(switch_channel_get_variable(channel, SWITCH_COPY_XML_CDR_VARIABLE))) { + switch_xml_t cdr; + char *xml_text; + + if (switch_ivr_generate_xml_cdr(session, &cdr) == SWITCH_STATUS_SUCCESS) { + if ((xml_text = switch_xml_toxml(cdr, SWITCH_FALSE))) { + switch_channel_set_variable_partner(channel, "b_leg_cdr", xml_text); + switch_safe_free(xml_text); + } + switch_xml_free(cdr); + } + } + + return SWITCH_STATUS_FALSE; }

1 0

[commit] r8954 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
by Freeswitch SVN 09 Jul '08

09 Jul '08

Author: brian Date: Wed Jul 9 09:50:58 2008 New Revision: 8954 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: tweaks Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Wed Jul 9 09:50:58 2008 @@ -32,6 +32,7 @@ #include <switch.h> #include <pocketsphinx.h> +#include <sphinxbase/err.h> SWITCH_MODULE_LOAD_FUNCTION(mod_pocketsphinx_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_pocketsphinx_shutdown); @@ -113,6 +114,16 @@ model = switch_mprintf("%s%smodel%s%s", SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_PATH_SEPARATOR, SWITCH_PATH_SEPARATOR, globals.model); + if (switch_file_exists(dic, ah->memory_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't open dictionary.\n"); + goto end; + } + + if (switch_file_exists(lm, ah->memory_pool) != SWITCH_STATUS_SUCCESS) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't open language model.\n"); + goto end; + } + switch_assert(lm && dic && model); ps->config = cmd_ln_init(ps->config, ps_args(), FALSE, @@ -380,7 +391,8 @@ asr_interface->asr_get_results = pocketsphinx_asr_get_results; globals.model = switch_core_strdup(pool, "communicator"); - + err_set_logfp(NULL); + /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; }

1 0

[commit] r8953 - freeswitch/trunk/scripts/js_modules
by Freeswitch SVN 09 Jul '08

09 Jul '08

Author: brian Date: Tue Jul 8 22:57:28 2008 New Revision: 8953 Modified: freeswitch/trunk/scripts/js_modules/SpeechTools.jm Log: tweaked SpeechTools Modified: freeswitch/trunk/scripts/js_modules/SpeechTools.jm ============================================================================== --- freeswitch/trunk/scripts/js_modules/SpeechTools.jm (original) +++ freeswitch/trunk/scripts/js_modules/SpeechTools.jm Tue Jul 8 22:57:28 2008 @@ -194,7 +194,6 @@ rv.push("_no_idea_"); } - console_log("debug", "dammit: " + rv + "\n"); delete interp; return rv; } @@ -287,6 +286,14 @@ } } + this.addItemAlias = function(item,alias) { + ia = item.split(","); + var x; + for (x = 0; x < ia.length; x++) { + this.items[this.index++] = ia[x] + ":::" + alias; + } + } + /* Add a regex */ this.addRegEx = function(item) { this.items[this.index++] = item; @@ -404,29 +411,41 @@ if (this.debug) { console_log("debug", "----Testing [" + y + "] [" + x + "] " + items[y] + " =~ [" + this.items[x] + "]\n"); } - var re = new RegExp(this.items[x]); + str = this.items[x]; + + ab = str.split(":::"); + + var re = new RegExp(ab[0], "i"); match = re.exec(items[y]); + if (match) { + for (i = 0; i < match.length; i++) { + if (ab.length == 1) { + rep = match[i]; + } else { + rep = ab[1]; + } + dup = false; for(z = 0; z < this.collected_items.length; z++) { - if (this.collected_items[z] == match[i]) { + if (this.collected_items[z] == rep) { dup = true; break; } } if (dup) { if (this.dup_sound) { - rv = this.react(this.dup_sound + " " + match[i], this.dup_sound + "," + match[i]); + rv = this.react(this.dup_sound + " " + rep, this.dup_sound + "," + rep); } } else { if (this.debug) { - console_log("debug", "----Adding " + match[i] + "\n"); + console_log("debug", "----Adding " + rep + "\n"); } - this.collected_items[this.collected_index++] = match[i]; + this.collected_items[this.collected_index++] = rep; hit = true; if (this.add_sound) { - rv = this.react(this.add_sound + " " + match[i], this.add_sound + "," + match[i]); + rv = this.react(this.add_sound + " " + rep, this.add_sound + "," + rep); } } }

1 0

[commit] r8952 - freeswitch/trunk/src/mod/applications/mod_dptools
by Freeswitch SVN 09 Jul '08

09 Jul '08

Author: anthm Date: Tue Jul 8 20:53:10 2008 New Revision: 8952 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: do expand_variables in the set app 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 Jul 8 20:53:10 2008 @@ -701,10 +701,13 @@ SWITCH_STANDARD_APP(set_function) { char *var, *val = NULL; - + if (switch_strlen_zero(data)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No variable name specified.\n"); } else { + switch_channel_t *channel = switch_core_session_get_channel(session); + char *expanded = NULL; + var = switch_core_session_strdup(session, data); val = strchr(var, '='); @@ -715,8 +718,16 @@ } } - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET [%s]=[%s]\n", var, val ? val : "UNDEF"); - switch_channel_set_variable(switch_core_session_get_channel(session), var, val); + if (val) { + expanded = switch_channel_expand_variables(channel, val); + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SET [%s]=[%s]\n", var, expanded ? expanded : "UNDEF"); + switch_channel_set_variable(channel, var, expanded); + + if (expanded && expanded != val) { + switch_safe_free(expanded); + } } }

1 0

[commit] r8951 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: brian Date: Tue Jul 8 19:37:56 2008 New Revision: 8951 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: woops Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Tue Jul 8 19:37:56 2008 @@ -332,12 +332,12 @@ if (switch_test_flag(ps, PSFLAG_HAS_TEXT)) { switch_mutex_lock(ps->flag_mutex); switch_clear_flag(ps, PSFLAG_HAS_TEXT); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Recognized: %s, Score: 300\n", ps->hyp); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Recognized: %s, Score: 600\n", ps->hyp); switch_mutex_unlock(ps->flag_mutex); /* ps->score isn't a confidence score. PocketSphinx doesn't support that yet. */ - *xmlstr = switch_mprintf("<interpretation grammar=\"%s\" score=\"300\">\n" + *xmlstr = switch_mprintf("<interpretation grammar=\"%s\" score=\"600\">\n" " <result name=\"%s\">%s</result>\n" " <input>%s</input>\n" "</interpretation>",

1 0

[commit] r8950 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
by Freeswitch SVN 08 Jul '08

08 Jul '08

Author: brian Date: Tue Jul 8 19:34:01 2008 New Revision: 8950 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: scores mean nothing yet Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Tue Jul 8 19:34:01 2008 @@ -332,15 +332,16 @@ if (switch_test_flag(ps, PSFLAG_HAS_TEXT)) { switch_mutex_lock(ps->flag_mutex); switch_clear_flag(ps, PSFLAG_HAS_TEXT); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Recognized: %s, Score: %d\n", ps->hyp, ps->score); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Recognized: %s, Score: 300\n", ps->hyp); switch_mutex_unlock(ps->flag_mutex); + + /* ps->score isn't a confidence score. PocketSphinx doesn't support that yet. */ - *xmlstr = switch_mprintf("<interpretation grammar=\"%s\" score=\"%d\">\n" + *xmlstr = switch_mprintf("<interpretation grammar=\"%s\" score=\"300\">\n" " <result name=\"%s\">%s</result>\n" " <input>%s</input>\n" "</interpretation>", - - ps->grammar, ps->score, + ps->grammar, "match", ps->hyp, ps->hyp

1 0