- Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8980 - freeswitch/trunk/scripts
by Freeswitch SVN 10 Jul '08

10 Jul '08

Author: brian Date: Wed Jul 9 21:51:47 2008 New Revision: 8980 Modified: freeswitch/trunk/scripts/ps_pizza.js Log: add additional regexp for testing Modified: freeswitch/trunk/scripts/ps_pizza.js ============================================================================== --- freeswitch/trunk/scripts/ps_pizza.js (original) +++ freeswitch/trunk/scripts/ps_pizza.js Wed Jul 9 21:51:47 2008 @@ -69,7 +69,7 @@ pizza.sizeObtainer.addItemAlias("^Large$", "Large"); pizza.sizeObtainer.addItemAlias("^Medium$", "Medium"); pizza.sizeObtainer.addItemAlias("^Small$", "Small"); -pizza.sizeObtainer.addItemAlias("^Humongous$,^Huge$,^Totally\\s*Humongous$", "TotallyHumongous"); +pizza.sizeObtainer.addItemAlias("^Humongous$,^Huge$,^Totally\\s*Humongous$,^Totally", "TotallyHumongous"); /***************** What Type Of Crust? *****************/ pizza.crustObtainer = new SpeechObtainer(asr, 1, 5000);

1 0

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

10 Jul '08

Author: brian Date: Wed Jul 9 21:41:38 2008 New Revision: 8979 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: doh 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 21:41:38 2008 @@ -437,7 +437,6 @@ static void do_load(void) { switch_mutex_lock(MUTEX); - memset(&globals, 0, sizeof(globals)); load_config(); switch_mutex_unlock(MUTEX); }

1 0

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

10 Jul '08

Author: brian Date: Wed Jul 9 21:19:27 2008 New Revision: 8978 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile Log: better be safe than sorry Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile Wed Jul 9 21:19:27 2008 @@ -40,11 +40,11 @@ $(TOUCH_TARGET) $(DESTDIR)$(PREFIX)/grammar/model: - mkdir $(DESTDIR)$(PREFIX)/grammar/model + mkdir -p $(DESTDIR)$(PREFIX)/grammar/model $(DESTDIR)$(PREFIX)/grammar/model/communicator: $(GETLIB) $(SPHINXMODEL).tar.gz - mkdir $(DESTDIR)$(PREFIX)/grammar/model/communicator + mkdir -p $(DESTDIR)$(PREFIX)/grammar/model/communicator mv $(BASE)/libs/Communicator_semi_40.cd_semi_6000/* $(DESTDIR)$(PREFIX)/grammar/model/communicator local_install: $(DESTDIR)$(PREFIX)/grammar/model $(DESTDIR)$(PREFIX)/grammar/model/communicator

1 0

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

10 Jul '08

Author: brian Date: Wed Jul 9 20:59:49 2008 New Revision: 8977 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: where did this come from 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 20:59:49 2008 @@ -454,7 +454,7 @@ { switch_asr_interface_t *asr_interface; - switch_mutex_init(&MUTEX, SWITCH_MUTEX_NESTED, pool);\ + switch_mutex_init(&MUTEX, SWITCH_MUTEX_NESTED, pool); if ((switch_event_bind_removable(modname, SWITCH_EVENT_RELOADXML, NULL, event_handler, NULL, &NODE) != SWITCH_STATUS_SUCCESS)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n");

1 0

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

10 Jul '08

Author: brian Date: Wed Jul 9 20:57:09 2008 New Revision: 8976 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: lets set a default for auto_reload also 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 20:57:09 2008 @@ -403,6 +403,7 @@ globals.thresh = 400; globals.silence_hits = 35; globals.listen_hits = 5; + globals.auto_reload = 1; if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf);

1 0

[commit] r8975 - in freeswitch/trunk: conf/autoload_configs src/mod/applications/mod_enum src/mod/asr_tts/mod_pocketsphinx
by Freeswitch SVN 10 Jul '08

10 Jul '08

Author: brian Date: Wed Jul 9 20:55:18 2008 New Revision: 8975 Added: freeswitch/trunk/conf/autoload_configs/pocketsphinx.conf.xml Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: adding more fun stuff Added: freeswitch/trunk/conf/autoload_configs/pocketsphinx.conf.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/autoload_configs/pocketsphinx.conf.xml Wed Jul 9 20:55:18 2008 @@ -0,0 +1,8 @@ +<configuration name="pocketsphinx.conf" description="PocketSphinx ASR Configuration"> + <settings> + <param name="threshold" value="400"/> + <param name="silence-hits" value="35"/> + <param name="listen-hits" value="5"/> + <param name="auto-reload" value="true"/> + </settings> +</configuration> Modified: freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c (original) +++ freeswitch/trunk/src/mod/applications/mod_enum/mod_enum.c Wed Jul 9 20:55:18 2008 @@ -742,7 +742,6 @@ globals.timeout = 10; load_config(); switch_mutex_unlock(MUTEX); - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ENUM Reloaded\n"); } @@ -811,11 +810,11 @@ return SWITCH_STATUS_SUCCESS; } - static void event_handler(switch_event_t *event) { if (globals.auto_reload) { do_load(); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ENUM Reloaded\n"); } } 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 20:55:18 2008 @@ -38,8 +38,15 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_pocketsphinx_shutdown); SWITCH_MODULE_DEFINITION(mod_pocketsphinx, mod_pocketsphinx_load, mod_pocketsphinx_shutdown, NULL); +static switch_mutex_t *MUTEX = NULL; +static switch_event_node_t *NODE = NULL; + static struct { char *model; + uint32_t thresh; + uint32_t silence_hits; + uint32_t listen_hits; + int auto_reload; } globals; typedef enum { @@ -84,10 +91,10 @@ ah->codec = switch_core_strdup(ah->memory_pool, codec); - ps->thresh = 400; - ps->silence_hits = 35; + ps->thresh = globals.thresh; + ps->silence_hits = globals.silence_hits; + ps->listen_hits = globals.listen_hits; ps->org_silence_hits = ps->silence_hits; - ps->listen_hits = 5; return SWITCH_STATUS_SUCCESS; } @@ -386,9 +393,74 @@ return status; } +static switch_status_t load_config(void) +{ + char *cf = "pocketsphinx.conf"; + switch_xml_t cfg, xml = NULL, param, settings; + switch_status_t status = SWITCH_STATUS_SUCCESS; + + /* Set defaults */ + globals.thresh = 400; + globals.silence_hits = 35; + globals.listen_hits = 5; + + if (!(xml = switch_xml_open_cfg(cf, &cfg, NULL))) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "open of %s failed\n", cf); + status = SWITCH_STATUS_FALSE; + goto done; + } + + if ((settings = switch_xml_child(cfg, "settings"))) { + for (param = switch_xml_child(settings, "param"); param; param = param->next) { + char *var = (char *) switch_xml_attr_soft(param, "name"); + char *val = (char *) switch_xml_attr_soft(param, "value"); + if (!strcasecmp(var, "threshold")) { + globals.thresh = atoi(val); + } else if (!strcasecmp(var, "silence-hits")) { + globals.silence_hits = atoi(val); + } else if (!strcasecmp(var, "listen-hits")) { + globals.listen_hits = atoi(val); + } else if (!strcasecmp(var, "auto-reload")) { + globals.auto_reload = switch_true(val); + } + } + } + done: + if (xml) { + switch_xml_free(xml); + } + + return status; +} + +static void do_load(void) +{ + switch_mutex_lock(MUTEX); + memset(&globals, 0, sizeof(globals)); + load_config(); + switch_mutex_unlock(MUTEX); +} + +static void event_handler(switch_event_t *event) +{ + if (globals.auto_reload) { + do_load(); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "PocketSphinx Reloaded\n"); + } +} + SWITCH_MODULE_LOAD_FUNCTION(mod_pocketsphinx_load) { switch_asr_interface_t *asr_interface; + + switch_mutex_init(&MUTEX, SWITCH_MUTEX_NESTED, pool);\ + + if ((switch_event_bind_removable(modname, SWITCH_EVENT_RELOADXML, NULL, event_handler, NULL, &NODE) != SWITCH_STATUS_SUCCESS)) { + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n"); + } + + do_load(); + /* connect my internal structure to the blank pointer passed to me */ *module_interface = switch_loadable_module_create_module_interface(pool, modname); @@ -413,6 +485,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_pocketsphinx_shutdown) { + switch_event_unbind(&NODE); return SWITCH_STATUS_UNLOAD; }

1 0

[commit] r8974 - in freeswitch/trunk: . debian
by Freeswitch SVN 10 Jul '08

10 Jul '08

Author: mikej Date: Wed Jul 9 20:09:04 2008 New Revision: 8974 Modified: freeswitch/trunk/debian/freeswitch.install freeswitch/trunk/freeswitch.spec Log: add files from the conf/dialplan/extensions directory to the packages (FSBUILD-56) Modified: freeswitch/trunk/debian/freeswitch.install ============================================================================== --- freeswitch/trunk/debian/freeswitch.install (original) +++ freeswitch/trunk/debian/freeswitch.install Wed Jul 9 20:09:04 2008 @@ -46,6 +46,7 @@ opt/freeswitch/conf/dialplan/default.xml opt/freeswitch/conf/dialplan/features.xml opt/freeswitch/conf/dialplan/extensions +opt/freeswitch/conf/dialplan/extensions/*.xml opt/freeswitch/conf/sip_profiles/external.xml opt/freeswitch/conf/sip_profiles/nat.xml opt/freeswitch/conf/sip_profiles/nat/example.xml Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Wed Jul 9 20:09:04 2008 @@ -330,6 +330,7 @@ %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/xml_rpc.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/autoload_configs/zeroconf.conf.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/dialplan/*.xml +%config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/dialplan/extensions/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/directory/*.xml %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/directory/default/* %config(noreplace) %attr(0640, freeswitch, daemon) %{prefix}/conf/mrcp_profiles/*.xml

1 0

[commit] r8973 - freeswitch/trunk/src/mod/languages/mod_python
by Freeswitch SVN 09 Jul '08

09 Jul '08

Author: brian Date: Wed Jul 9 19:46:50 2008 New Revision: 8973 Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp Log: remove unused var Modified: freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp (original) +++ freeswitch/trunk/src/mod/languages/mod_python/freeswitch_python.cpp Wed Jul 9 19:46:50 2008 @@ -121,7 +121,6 @@ char *resultStr; char *funcargs; - switch_file_handle_t *fh = NULL; bool did_swap_in = false; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "run_dtmf_callback\n");

1 0

[commit] r8972 - freeswitch/trunk/src
by Freeswitch SVN 09 Jul '08

09 Jul '08

Author: mikej Date: Wed Jul 9 18:39:48 2008 New Revision: 8972 Modified: freeswitch/trunk/src/switch_core_codec.c Log: report based on the codec we actually set. 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 18:39:48 2008 @@ -76,16 +76,16 @@ if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(session->channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-read-codec-name", "%s", codec->implementation->iananame); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-read-codec-rate", "%d", codec->implementation->actual_samples_per_second); - if (codec->implementation->actual_samples_per_second != codec->implementation->samples_per_second) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-reported-read-codec-rate", "%d", codec->implementation->samples_per_second); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-read-codec-name", "%s", session->read_codec->implementation->iananame); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-read-codec-rate", "%d", session->read_codec->implementation->actual_samples_per_second); + if (session->read_codec->implementation->actual_samples_per_second != session->read_codec->implementation->samples_per_second) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-reported-read-codec-rate", "%d", session->read_codec->implementation->samples_per_second); } switch_event_fire(&event); } - switch_channel_set_variable(channel, "read_codec", codec->implementation->iananame); - switch_snprintf(tmp, sizeof(tmp), "%d", codec->implementation->actual_samples_per_second); + switch_channel_set_variable(channel, "read_codec", session->read_codec->implementation->iananame); + switch_snprintf(tmp, sizeof(tmp), "%d", session->read_codec->implementation->actual_samples_per_second); switch_channel_set_variable(channel, "read_rate", tmp); @@ -140,17 +140,17 @@ if (switch_event_create(&event, SWITCH_EVENT_CODEC) == SWITCH_STATUS_SUCCESS) { switch_channel_event_set_data(session->channel, event); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-write-codec-name", "%s", codec->implementation->iananame); - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-write-codec-rate", "%d", codec->implementation->actual_samples_per_second); - if (codec->implementation->actual_samples_per_second != codec->implementation->samples_per_second) { + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-write-codec-name", "%s", session->write_codec->implementation->iananame); + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-write-codec-rate", "%d", session->write_codec->implementation->actual_samples_per_second); + if (session->write_codec->implementation->actual_samples_per_second != session->write_codec->implementation->samples_per_second) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "channel-reported-write-codec-rate", "%d", - codec->implementation->actual_samples_per_second); + session->write_codec->implementation->actual_samples_per_second); } switch_event_fire(&event); } - switch_channel_set_variable(channel, "write_codec", codec->implementation->iananame); - switch_snprintf(tmp, sizeof(tmp), "%d", codec->implementation->actual_samples_per_second); + switch_channel_set_variable(channel, "write_codec", session->write_codec->implementation->iananame); + switch_snprintf(tmp, sizeof(tmp), "%d", session->write_codec->implementation->actual_samples_per_second); switch_channel_set_variable(channel, "write_rate", tmp); return SWITCH_STATUS_SUCCESS;

1 0

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

09 Jul '08

Author: brian Date: Wed Jul 9 18:39:44 2008 New Revision: 8971 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: remove non ANSI comment 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 18:39:44 2008 @@ -168,7 +168,6 @@ status = SWITCH_STATUS_SUCCESS; end: - switch_safe_free(lm); switch_safe_free(dic); @@ -180,7 +179,6 @@ /*! function to unload a grammar to the asr interface */ static switch_status_t pocketsphinx_asr_unload_grammar(switch_asr_handle_t *ah, const char *grammar) { - // not sure an unload exists. return SWITCH_STATUS_SUCCESS; }

1 0