July 2008 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r8970 - freeswitch/trunk/src/mod/formats/mod_tone_stream
by Freeswitch SVN 09 Jul '08

09 Jul '08

Author: mikej Date: Wed Jul 9 18:31:56 2008 New Revision: 8970 Modified: freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c Log: signed/unsigned mismatch Modified: freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c Wed Jul 9 18:31:56 2008 @@ -85,7 +85,7 @@ return SWITCH_STATUS_FALSE; } - if (*len > sh->samples) { + if (*len > (size_t)sh->samples) { *len = sh->samples; }

1 0

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

09 Jul '08

Author: anthm Date: Wed Jul 9 18:30:40 2008 New Revision: 8969 Modified: freeswitch/trunk/scripts/ps_pizza.js Log: tweak Modified: freeswitch/trunk/scripts/ps_pizza.js ============================================================================== --- freeswitch/trunk/scripts/ps_pizza.js (original) +++ freeswitch/trunk/scripts/ps_pizza.js Wed Jul 9 18:30:40 2008 @@ -87,7 +87,7 @@ 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"); +pizza.typeObtainer.addItemAlias("^pick", "Custom"); /***************** Which Specialty? *****************/ @@ -107,7 +107,7 @@ 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("anchovie,anchovies", "anchovies"); pizza.toppingsObtainer.addItemAlias("artichoke,artichockes", "artichoke"); pizza.toppingsObtainer.addItemAlias("canadian\\s*bacon", "canadianbacon"); pizza.toppingsObtainer.addItemAlias("everything", "everything");

1 0

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

09 Jul '08

Author: brian Date: Wed Jul 9 18:24:01 2008 New Revision: 8968 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: ifdef these 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:24:01 2008 @@ -131,6 +131,8 @@ "-hmm", model, "-lm", lm, "-dict", dic, +#if 0 + "-agc", "noise", "-beam", "1e-60", "-wbeam", "1e-40", "-ci_pbeam", "1e-8", @@ -139,6 +141,7 @@ "-maxcdsenpf", "1000", "-maxwpf", "8", "-ds", "2", +#endif NULL); if (ps->config == NULL) {

1 0

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

09 Jul '08

Author: anthm Date: Wed Jul 9 17:19:18 2008 New Revision: 8967 Modified: freeswitch/trunk/src/switch_ivr_async.c Log: a day at the races Modified: freeswitch/trunk/src/switch_ivr_async.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_async.c (original) +++ freeswitch/trunk/src/switch_ivr_async.c Wed Jul 9 17:19:18 2008 @@ -1490,6 +1490,7 @@ switch_mutex_t *mutex; switch_thread_cond_t *cond; switch_memory_pool_t *pool; + int ready; }; static void *SWITCH_THREAD_FUNC speech_thread(switch_thread_t *thread, void *obj) @@ -1505,6 +1506,8 @@ switch_core_session_read_lock(sth->session); switch_mutex_lock(sth->mutex); + sth->ready = 1; + while (switch_channel_ready(channel) && !switch_test_flag(sth->ah, SWITCH_ASR_FLAG_CLOSED)) { char *xmlstr = NULL; @@ -1619,9 +1622,11 @@ break; case SWITCH_ABC_TYPE_CLOSE:{ switch_core_asr_close(sth->ah, &flags); - switch_mutex_lock(sth->mutex); - switch_thread_cond_signal(sth->cond); - switch_mutex_unlock(sth->mutex); + if (sth->mutex && sth->cond && sth->ready) { + switch_mutex_lock(sth->mutex); + switch_thread_cond_signal(sth->cond); + switch_mutex_unlock(sth->mutex); + } } break; case SWITCH_ABC_TYPE_READ:

1 0

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

09 Jul '08

Author: anthm Date: Wed Jul 9 16:51:19 2008 New Revision: 8966 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile Log: build tweak 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 16:51:19 2008 @@ -38,3 +38,13 @@ $(POCKETSPHINX_LA): $(POCKETSPHINX_DIR)/Makefile cd $(POCKETSPHINX_DIR) && $(MAKE) $(TOUCH_TARGET) + +$(DESTDIR)$(PREFIX)/grammar/model: + mkdir $(DESTDIR)$(PREFIX)/grammar/model + +$(DESTDIR)$(PREFIX)/grammar/model/communicator: + $(GETLIB) $(SPHINXMODEL).tar.gz + mkdir $(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] r8965 - freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx
by Freeswitch SVN 09 Jul '08

09 Jul '08

Author: brian Date: Wed Jul 9 16:30:08 2008 New Revision: 8965 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: update build system for pocketsphinx 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 16:30:08 2008 @@ -1,4 +1,40 @@ -LOCAL_CFLAGS=`PKG_CONFIG_PATH=/usr/local/lib/pkgconfig pkg-config --cflags pocketsphinx sphinxbase` -LOCAL_LDFLAGS=`PKG_CONFIG_PATH=/usr/local/lib/pkgconfig pkg-config --libs pocketsphinx sphinxbase` +SPHINXBASE=sphinxbase-0.4 +SPHINXBASE_DIR=$(switch_srcdir)/libs/$(SPHINXBASE) +POCKETSPHINX=pocketsphinx-0.5 +POCKETSPHINX_DIR=$(switch_srcdir)/libs/$(POCKETSPHINX) +SPHINXBASE_LA=$(SPHINXBASE_DIR)/src/libsphinxbase/libsphinxbase.la +SPHINXBASE_LA2=$(SPHINXBASE_DIR)/src/libsphinxad/libsphinxad.la + +POCKETSPHINX_LA=$(POCKETSPHINX_DIR)/src/libpocketsphinx/libpocketsphinx.la + +SPHINXMODEL=communicator_semi_6000_20080321 + +LOCAL_CFLAGS=-I$(SPHINXBASE_DIR)/include -I$(POCKETSPHINX_DIR)/include +LOCAL_LIBADD=$(SPHINXBASE_LA) $(SPHINXBASE_LA2) $(POCKETSPHINX_LA) BASE=../../../.. include $(BASE)/build/modmake.rules + +$(SPHINXBASE_DIR): + $(GETLIB) $(SPHINXBASE).tar.gz + +$(SPHINXBASE_DIR)/buildstamp: $(SPHINXBASE_DIR) + test -f $(SPHINXBASE_DIR)/Makefile || (cd $(SPHINXBASE_DIR) && ./configure --with-pic --without-python --disable-shared) + test -f $(SPHINXBASE_DIR)/buildstamp || (touch $(SPHINXBASE_DIR)/buildstamp) + +$(SPHINXBASE_LA): $(SPHINXBASE_DIR)/buildstamp + cd $(SPHINXBASE_DIR) && $(MAKE) + $(TOUCH_TARGET) + +$(POCKETSPHINX_DIR): + $(GETLIB) $(POCKETSPHINX).tar.gz + +$(POCKETSPHINX_DIR)/Makefile: $(POCKETSPHINX_DIR) + cd $(POCKETSPHINX_DIR) && ./configure --with-pic --without-python --disable-shared --with-sphinxbase=$(SPHINXBASE_DIR) + $(TOUCH_TARGET) + +$(POCKETSPHINX_DIR)/buildstamp: $(POCKETSPHINX_DIR)/Makefile + test -f $(POCKETSPHINX_DIR)/buildstamp || touch $(POCKETSPHINX_DIR)/buildstamp + +$(POCKETSPHINX_LA): $(POCKETSPHINX_DIR)/Makefile + cd $(POCKETSPHINX_DIR) && $(MAKE) + $(TOUCH_TARGET) 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 16:30:08 2008 @@ -32,7 +32,7 @@ #include <switch.h> #include <pocketsphinx.h> -#include <sphinxbase/err.h> +#include <err.h> SWITCH_MODULE_LOAD_FUNCTION(mod_pocketsphinx_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_pocketsphinx_shutdown);

1 0

[commit] r8964 - freeswitch/trunk/src/mod/formats/mod_tone_stream
by Freeswitch SVN 09 Jul '08

09 Jul '08

Author: anthm Date: Wed Jul 9 15:03:44 2008 New Revision: 8964 Modified: freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c Log: add silence_stream Modified: freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c Wed Jul 9 15:03:44 2008 @@ -35,15 +35,15 @@ SWITCH_MODULE_DEFINITION(mod_tone_stream, mod_tone_stream_load, NULL, NULL); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_tone_stream_shutdown); -struct sleep_handle { +struct silence_handle { int32_t samples; int silence; }; -static switch_status_t sleep_stream_file_open(switch_file_handle_t *handle, const char *path) +static switch_status_t silence_stream_file_open(switch_file_handle_t *handle, const char *path) { - struct sleep_handle *sh; + struct silence_handle *sh; int ms; sh = switch_core_alloc(handle->memory_pool, sizeof(*sh)); @@ -72,14 +72,14 @@ return SWITCH_STATUS_GENERR; } -static switch_status_t sleep_stream_file_close(switch_file_handle_t *handle) +static switch_status_t silence_stream_file_close(switch_file_handle_t *handle) { return SWITCH_STATUS_SUCCESS; } -static switch_status_t sleep_stream_file_read(switch_file_handle_t *handle, void *data, size_t *len) +static switch_status_t silence_stream_file_read(switch_file_handle_t *handle, void *data, size_t *len) { - struct sleep_handle *sh = handle->private_info; + struct silence_handle *sh = handle->private_info; if (sh->samples <= 0) { return SWITCH_STATUS_FALSE; @@ -196,13 +196,13 @@ /* Registration */ static char *supported_formats[SWITCH_MAX_CODECS] = { 0 }; -static char *sleep_supported_formats[SWITCH_MAX_CODECS] = { 0 }; +static char *silence_supported_formats[SWITCH_MAX_CODECS] = { 0 }; SWITCH_MODULE_LOAD_FUNCTION(mod_tone_stream_load) { switch_file_interface_t *file_interface; supported_formats[0] = "tone_stream"; - sleep_supported_formats[0] = "sleep_stream"; + silence_supported_formats[0] = "silence_stream"; *module_interface = switch_loadable_module_create_module_interface(pool, modname); file_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_FILE_INTERFACE); @@ -214,10 +214,10 @@ file_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_FILE_INTERFACE); file_interface->interface_name = modname; - file_interface->extens = sleep_supported_formats; - file_interface->file_open = sleep_stream_file_open; - file_interface->file_close = sleep_stream_file_close; - file_interface->file_read = sleep_stream_file_read; + file_interface->extens = silence_supported_formats; + file_interface->file_open = silence_stream_file_open; + file_interface->file_close = silence_stream_file_close; + file_interface->file_read = silence_stream_file_read; /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS;

1 0

[commit] r8963 - freeswitch/trunk/src/mod/formats/mod_tone_stream
by Freeswitch SVN 09 Jul '08

09 Jul '08

Author: anthm Date: Wed Jul 9 15:03:25 2008 New Revision: 8963 Modified: freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c Log: add silence_stream Modified: freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c (original) +++ freeswitch/trunk/src/mod/formats/mod_tone_stream/mod_tone_stream.c Wed Jul 9 15:03:25 2008 @@ -35,6 +35,72 @@ SWITCH_MODULE_DEFINITION(mod_tone_stream, mod_tone_stream_load, NULL, NULL); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_tone_stream_shutdown); +struct sleep_handle { + int32_t samples; + int silence; +}; + +static switch_status_t sleep_stream_file_open(switch_file_handle_t *handle, const char *path) +{ + + struct sleep_handle *sh; + int ms; + + sh = switch_core_alloc(handle->memory_pool, sizeof(*sh)); + + ms = atoi(path); + + if (ms > 0) { + char *p; + + sh->samples = (handle->samplerate / 1000) * ms; + + if ((p = strchr(path, ','))) { + p++; + ms = atoi(p); + if (ms > 0) { + sh->silence = ms; + } + } + + handle->private_info = sh; + return SWITCH_STATUS_SUCCESS; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid format!\n"); + + return SWITCH_STATUS_GENERR; +} + +static switch_status_t sleep_stream_file_close(switch_file_handle_t *handle) +{ + return SWITCH_STATUS_SUCCESS; +} + +static switch_status_t sleep_stream_file_read(switch_file_handle_t *handle, void *data, size_t *len) +{ + struct sleep_handle *sh = handle->private_info; + + if (sh->samples <= 0) { + return SWITCH_STATUS_FALSE; + } + + if (*len > sh->samples) { + *len = sh->samples; + } + + sh->samples -= *len; + + if (sh->silence) { + switch_generate_sln_silence((int16_t *) data, *len, sh->silence); + } else { + memset(data, 0, *len); + } + + return SWITCH_STATUS_SUCCESS; +} + + static int teletone_handler(teletone_generation_session_t *ts, teletone_tone_map_t *map) { switch_buffer_t *audio_buffer = ts->user_data; @@ -130,11 +196,13 @@ /* Registration */ static char *supported_formats[SWITCH_MAX_CODECS] = { 0 }; +static char *sleep_supported_formats[SWITCH_MAX_CODECS] = { 0 }; SWITCH_MODULE_LOAD_FUNCTION(mod_tone_stream_load) { switch_file_interface_t *file_interface; supported_formats[0] = "tone_stream"; + sleep_supported_formats[0] = "sleep_stream"; *module_interface = switch_loadable_module_create_module_interface(pool, modname); file_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_FILE_INTERFACE); @@ -144,6 +212,13 @@ file_interface->file_close = tone_stream_file_close; file_interface->file_read = tone_stream_file_read; + file_interface = switch_loadable_module_create_interface(*module_interface, SWITCH_FILE_INTERFACE); + file_interface->interface_name = modname; + file_interface->extens = sleep_supported_formats; + file_interface->file_open = sleep_stream_file_open; + file_interface->file_close = sleep_stream_file_close; + file_interface->file_read = sleep_stream_file_read; + /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_SUCCESS; }

1 0

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

09 Jul '08

Author: brian Date: Wed Jul 9 14:00:38 2008 New Revision: 8962 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: tweak 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 14:00:38 2008 @@ -135,7 +135,7 @@ "-wbeam", "1e-40", "-ci_pbeam", "1e-8", "-subvqbeam", "1e-2", - "-maxhmmpf", "2000", + "-maxhmmpf", "10000", "-maxcdsenpf", "1000", "-maxwpf", "8", "-ds", "2", @@ -351,16 +351,21 @@ 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: 600\n", ps->hyp); + + if (ps->score < 0) { + ps->score = 600; + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Recognized: %s, Score: %d\n", ps->hyp, ps->score); 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=\"600\">\n" + *xmlstr = switch_mprintf("<interpretation grammar=\"%s\" score=\"%d\">\n" " <result name=\"%s\">%s</result>\n" " <input>%s</input>\n" "</interpretation>", - ps->grammar, + ps->grammar, ps->score, "match", ps->hyp, ps->hyp

1 0

[commit] r8961 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 09 Jul '08

09 Jul '08

Author: anthm Date: Wed Jul 9 13:54:03 2008 New Revision: 8961 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: can of worms from ray's present Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Wed Jul 9 13:54:03 2008 @@ -83,9 +83,9 @@ switch_core_hash_delete(mod_sofia_globals.gateway_hash, gateway_ptr->name); switch_core_hash_delete(mod_sofia_globals.gateway_hash, gateway_ptr->register_from); switch_core_hash_delete(mod_sofia_globals.gateway_hash, gateway_ptr->register_contact); - - last = gateway_ptr; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "deleted gateway %s\n", gateway_ptr->name); + } else { + last = gateway_ptr; } }

1 0