- Freeswitch-trunk - FreeSWITCH Mailing Lists

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

10 Jul '08

Author: mikej Date: Thu Jul 10 15:34:06 2008 New Revision: 8991 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: tweak syntax string 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 Thu Jul 10 15:34:06 2008 @@ -2102,7 +2102,7 @@ switch_ivr_unhold_uuid(switch_core_session_get_uuid(session)); } -#define WAIT_FOR_SILENCE_SYNTAX "<silence_tresh> <silence hits> <listen hits> [<file>]" +#define WAIT_FOR_SILENCE_SYNTAX "<silence_thresh> <silence_hits> <listen_hits> [<file>]" SWITCH_STANDARD_APP(wait_for_silence_function) { char *argv[4] = { 0 };

1 0

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

10 Jul '08

Author: brian Date: Thu Jul 10 15:33:38 2008 New Revision: 8990 Modified: freeswitch/trunk/scripts/ps_pizza.js Log: tweaks for scores in ps Modified: freeswitch/trunk/scripts/ps_pizza.js ============================================================================== --- freeswitch/trunk/scripts/ps_pizza.js (original) +++ freeswitch/trunk/scripts/ps_pizza.js Thu Jul 10 15:33:38 2008 @@ -33,8 +33,8 @@ function on_dtmf(a, b, c) {} -var dft_min = 100; -var dft_confirm = 600; +var dft_min = 10; +var dft_confirm = 50; /***************** Initialize The Speech Detector *****************/ var asr = new SpeechDetect(session, "pocketsphinx"); @@ -104,7 +104,7 @@ /***************** What Toppings? *****************/ pizza.toppingsObtainer = new SpeechObtainer(asr, 1, 5000); -pizza.toppingsObtainer.setGrammar("pizza_toppings", "", "result", dft_min, 400, true); +pizza.toppingsObtainer.setGrammar("pizza_toppings", "", "result", dft_min, dft_confirm, true); pizza.toppingsObtainer.setTopSound("GP-Toppings"); pizza.toppingsObtainer.setBadSound("GP-NI"); pizza.toppingsObtainer.addItemAlias("anchovie,anchovies", "anchovies"); @@ -130,7 +130,7 @@ /***************** 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.setGrammar("pizza_arso", "", "result", dft_min, dft_confirm, true); pizza.arsoObtainer.setTopSound("GP-ARSO"); pizza.arsoObtainer.setBadSound("GP-NI"); pizza.arsoObtainer.addItemAlias("^delivery$", "delivery"); @@ -142,7 +142,7 @@ /***************** Yes? No? Maybe So? *****************/ pizza.yesnoObtainer = new SpeechObtainer(asr, 1, 5000); -pizza.yesnoObtainer.setGrammar("pizza_yesno", "", "result", 500, 250, true); +pizza.yesnoObtainer.setGrammar("pizza_yesno", "", "result", dft_min, dft_confirm, true); pizza.yesnoObtainer.setBadSound("GP-NI"); pizza.yesnoObtainer.addItemAlias("^yes,^correct", "yes"); pizza.yesnoObtainer.addItemAlias("^no", "no");

1 0

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

10 Jul '08

Author: brian Date: Thu Jul 10 15:32:43 2008 New Revision: 8989 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: confidence scores are 0 best to 100 worst 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 Thu Jul 10 15:32:43 2008 @@ -33,6 +33,7 @@ #include <switch.h> #include <pocketsphinx.h> #include <err.h> +#include <logmath.h> SWITCH_MODULE_LOAD_FUNCTION(mod_pocketsphinx_load); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_pocketsphinx_shutdown); @@ -354,7 +355,7 @@ { pocketsphinx_t *ps = (pocketsphinx_t *) ah->private_info; switch_status_t status = SWITCH_STATUS_SUCCESS; - int32_t score; + int32_t conf, lconf; if (switch_test_flag(ps, PSFLAG_BARGE)) { switch_clear_flag_locked(ps, PSFLAG_BARGE); @@ -365,8 +366,13 @@ switch_mutex_lock(ps->flag_mutex); switch_clear_flag(ps, PSFLAG_HAS_TEXT); - score = ps_get_prob(ps->ps, &ps->uttid); - ps->confidence = score - score - score / 1000; + conf = ps_get_prob(ps->ps, &ps->uttid); + lconf = logmath_log_to_ln(ps_get_logmath(ps->ps), conf); + ps->confidence = lconf - lconf - lconf; + /* 0(confident) to 100(not confident) score */ + if (ps->confidence > 100) { + ps->confidence = 100; + } switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Recognized: %s, Score: %d\n", ps->hyp, ps->confidence); switch_mutex_unlock(ps->flag_mutex);

1 0

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

10 Jul '08

Author: mikej Date: Thu Jul 10 15:22:06 2008 New Revision: 8988 Modified: freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c Log: tweak syntax string 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 Thu Jul 10 15:22:06 2008 @@ -2102,7 +2102,7 @@ switch_ivr_unhold_uuid(switch_core_session_get_uuid(session)); } -#define WAIT_FOR_SILENCE_SYNTAX "<tresh> <silence hits> <listen hits> [<file>]" +#define WAIT_FOR_SILENCE_SYNTAX "<silence_tresh> <silence hits> <listen hits> [<file>]" SWITCH_STANDARD_APP(wait_for_silence_function) { char *argv[4] = { 0 };

1 0

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

10 Jul '08

Author: brian Date: Thu Jul 10 12:35:08 2008 New Revision: 8987 Modified: freeswitch/trunk/freeswitch.spec Log: tweak Modified: freeswitch/trunk/freeswitch.spec ============================================================================== --- freeswitch/trunk/freeswitch.spec (original) +++ freeswitch/trunk/freeswitch.spec Thu Jul 10 12:35:08 2008 @@ -167,7 +167,7 @@ LOGGERS_MODULES="loggers/mod_console loggers/mod_logfile loggers/mod_syslog" SAY_MODULES="say/mod_say_en" TIMERS_MODULES= -DISABLED_MODULES="applications/mod_sountouch directories/mod_ldap languages/mod_java languages/mod_python languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf formats/mod_shout say/mod_say_it say/mod_say_es say/mod_say_nl" +DISABLED_MODULES="applications/mod_soundtouch directories/mod_ldap languages/mod_java languages/mod_python languages/mod_spidermonkey_skel ast_tts/mod_cepstral asr_tts/mod_lumenvox endpoints/mod_wanpipe event_handlers/mod_event_test event_handlers/mod_radius_cdr event_handlers/mod_zeroconf formats/mod_shout say/mod_say_it say/mod_say_es say/mod_say_nl" XML_INT_MODULES="xml_int/mod_xml_rpc xml_int/mod_xml_curl xml_int/mod_xml_cdr" MYMODULES="$PASSTHRU_CODEC_MODULES $SPIDERMONKEY_MODULES $APPLICATIONS_MODULES $ASR_TTS_MODULES $CODECS_MODULES $DIALPLANS_MODULES $DIRECTORIES_MODULES $DOTNET_MODULES $ENDPOINTS_MODULES $EVENT_HANDLERS_MODULES $FORMATS_MODULES $LANGUAGES_MODULES $LOGGERS_MODULES $SAY_MODULES $TIMERS_MODULES $XML_INT_MODULES"

1 0

[commit] r8986 - in freeswitch/trunk/src: . include mod/applications/mod_dptools
by Freeswitch SVN 10 Jul '08

10 Jul '08

Author: anthm Date: Thu Jul 10 11:57:41 2008 New Revision: 8986 Modified: freeswitch/trunk/src/include/switch_ivr.h freeswitch/trunk/src/mod/applications/mod_dptools/mod_dptools.c freeswitch/trunk/src/switch_ivr_play_say.c Log: add wait_for_voice app for MC Modified: freeswitch/trunk/src/include/switch_ivr.h ============================================================================== --- freeswitch/trunk/src/include/switch_ivr.h (original) +++ freeswitch/trunk/src/include/switch_ivr.h Thu Jul 10 11:57:41 2008 @@ -314,6 +314,9 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_play_file(switch_core_session_t *session, switch_file_handle_t *fh, const char *file, switch_input_args_t *args); +SWITCH_DECLARE(switch_status_t) switch_ivr_wait_for_silence(switch_core_session_t *session, uint32_t thresh, uint32_t silence_hits, + uint32_t listen_hits, const char *file); + SWITCH_DECLARE(switch_status_t) switch_ivr_gentones(switch_core_session_t *session, char *script, int32_t loops, switch_input_args_t *args); /*! 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 Thu Jul 10 11:57:41 2008 @@ -2102,6 +2102,31 @@ switch_ivr_unhold_uuid(switch_core_session_get_uuid(session)); } +#define WAIT_FOR_SILENCE_SYNTAX "<tresh> <silence hits> <listen hits> [<file>]" +SWITCH_STANDARD_APP(wait_for_silence_function) +{ + char *argv[4] = { 0 }; + uint32_t thresh, silence_hits, listen_hits; + int argc; + char *lbuf = NULL; + + if (!switch_strlen_zero(data) && (lbuf = switch_core_session_strdup(session, data)) + && (argc = switch_separate_string(lbuf, ' ', argv, (sizeof(argv) / sizeof(argv[0])))) >= 3) { + thresh = atoi(argv[0]); + silence_hits = atoi(argv[1]); + listen_hits = atoi(argv[2]); + + if (thresh > 0 && silence_hits > 0 && listen_hits > 0) { + switch_ivr_wait_for_silence(session, thresh, silence_hits, listen_hits, argv[3]); + return; + } + + } + + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Usage: %s\n", WAIT_FOR_SILENCE_SYNTAX); + +} + #define SPEAK_DESC "Speak text to a channel via the tts interface" #define DISPLACE_DESC "Displace audio from a file to the channels input" #define SESS_REC_DESC "Starts a background recording of the entire session" @@ -2226,6 +2251,8 @@ SAF_SUPPORT_NOMEDIA); SWITCH_ADD_APP(app_interface, "say", "say", "say", say_function, SAY_SYNTAX, SAF_NONE); + SWITCH_ADD_APP(app_interface, "wait_for_silence", "wait_for_silence", "wait_for_silence", wait_for_silence_function, WAIT_FOR_SILENCE_SYNTAX, SAF_NONE); + SWITCH_ADD_DIALPLAN(dp_interface, "inline", inline_dialplan_hunt); /* indicate that the module should continue to be loaded */ Modified: freeswitch/trunk/src/switch_ivr_play_say.c ============================================================================== --- freeswitch/trunk/src/switch_ivr_play_say.c (original) +++ freeswitch/trunk/src/switch_ivr_play_say.c Thu Jul 10 11:57:41 2008 @@ -1195,6 +1195,125 @@ return status; } +SWITCH_DECLARE(switch_status_t) switch_ivr_wait_for_silence(switch_core_session_t *session, uint32_t thresh, uint32_t silence_hits, uint32_t listen_hits, const char *file) +{ + uint32_t score, count = 0, j = 0; + double energy = 0; + switch_channel_t *channel = switch_core_session_get_channel(session); + int divisor = 0; + switch_codec_t *read_codec = switch_core_session_get_read_codec(session); + uint32_t org_silence_hits = silence_hits; + uint32_t channels; + switch_frame_t *read_frame; + switch_status_t status = SWITCH_STATUS_FALSE; + int16_t *data; + int listening = 0; + int countdown = 0; + switch_codec_t raw_codec = {0}; + int16_t *abuf = NULL; + switch_frame_t write_frame = {0}; + switch_file_handle_t fh = {0}; + + switch_assert(read_codec); + + if (file) { + if (switch_core_file_open(&fh, + file, + read_codec->implementation->number_of_channels, + read_codec->implementation->actual_samples_per_second, + SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) { + switch_core_session_reset(session, SWITCH_TRUE); + return SWITCH_STATUS_NOTFOUND; + } + switch_zmalloc(abuf, SWITCH_RECOMMENDED_BUFFER_SIZE); + write_frame.data = abuf; + write_frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE; + } + + + if (switch_core_codec_init(&raw_codec, + "L16", + NULL, + read_codec->implementation->actual_samples_per_second, + read_codec->implementation->microseconds_per_frame / 1000, + 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, + NULL, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) { + + status = SWITCH_STATUS_FALSE; + goto end; + } + + write_frame.codec = &raw_codec; + + divisor = read_codec->implementation->actual_samples_per_second / 8000; + channels = read_codec->implementation->number_of_channels; + + switch_core_session_set_read_codec(session, &raw_codec); + + while (switch_channel_ready(channel)) { + + status = switch_core_session_read_frame(session, &read_frame, SWITCH_IO_FLAG_NONE, 0); + + if (!SWITCH_READ_ACCEPTABLE(status)) { + break; + } + + if (abuf) { + switch_size_t olen = raw_codec.implementation->samples_per_frame; + + if (switch_core_file_read(&fh, abuf, &olen) != SWITCH_STATUS_SUCCESS) { + break; + } + + write_frame.samples = olen; + write_frame.datalen = olen * sizeof(int16_t); + if ((status = switch_core_session_write_frame(session, &write_frame, SWITCH_IO_FLAG_NONE, 0)) != SWITCH_STATUS_SUCCESS) { + break; + } + } + + if (countdown) { + if (!--countdown) { + break; + } else { + continue; + } + } + + data = (int16_t *) read_frame->data; + + for (energy = 0, j = 0, count = 0; count < read_frame->samples; count++) { + energy += abs(data[j++]); + j += channels; + } + + score = (uint32_t) (energy / (read_frame->samples / divisor)); + + if (score >= thresh) { + listening++; + } + + if (listening > listen_hits && score < thresh) { + if (!--silence_hits) { + countdown = 25; + } + } else { + silence_hits = org_silence_hits; + } + } + + switch_core_session_set_read_codec(session, NULL); + switch_core_codec_destroy(&raw_codec); + + end: + + if (abuf) { + switch_core_file_close(&fh); + } + + return status; +} + SWITCH_DECLARE(switch_status_t) switch_ivr_read(switch_core_session_t *session, uint32_t min_digits, uint32_t max_digits,

1 0

[commit] r8985 - in freeswitch/trunk: conf/autoload_configs src
by Freeswitch SVN 10 Jul '08

10 Jul '08

Author: mikej Date: Thu Jul 10 11:35:35 2008 New Revision: 8985 Modified: freeswitch/trunk/conf/autoload_configs/switch.conf.xml freeswitch/trunk/src/switch_utils.c Log: mailer implementation for windows (FSCORE-115) Modified: freeswitch/trunk/conf/autoload_configs/switch.conf.xml ============================================================================== --- freeswitch/trunk/conf/autoload_configs/switch.conf.xml (original) +++ freeswitch/trunk/conf/autoload_configs/switch.conf.xml Thu Jul 10 11:35:35 2008 @@ -26,6 +26,32 @@ <param name="crash-protection" value="false"/>   +  <param name="mailer-app" value="sendmail"/> <param name="mailer-app-args" value="-t"/> <param name="dump-cores" value="yes"/> Modified: freeswitch/trunk/src/switch_utils.c ============================================================================== --- freeswitch/trunk/src/switch_utils.c (original) +++ freeswitch/trunk/src/switch_utils.c Thu Jul 10 11:35:35 2008 @@ -463,7 +463,11 @@ if (ifd) { close(ifd); } +#ifdef WIN32 + switch_snprintf(buf, B64BUFFLEN, "type %s | %s %s %s", filename, runtime.mailer_app, runtime.mailer_app_args, to); +#else switch_snprintf(buf, B64BUFFLEN, "/bin/cat %s | %s %s %s", filename, runtime.mailer_app, runtime.mailer_app_args, to); +#endif if (system(buf)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to execute command: %s\n", buf); }

1 0

[commit] r8984 - in freeswitch/trunk/src: . include mod/applications/mod_commands
by Freeswitch SVN 10 Jul '08

10 Jul '08

Author: brian Date: Thu Jul 10 10:41:31 2008 New Revision: 8984 Modified: freeswitch/trunk/src/include/switch_loadable_module.h freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c freeswitch/trunk/src/switch_loadable_module.c Log: add module_exists api call Modified: freeswitch/trunk/src/include/switch_loadable_module.h ============================================================================== --- freeswitch/trunk/src/include/switch_loadable_module.h (original) +++ freeswitch/trunk/src/include/switch_loadable_module.h Thu Jul 10 10:41:31 2008 @@ -242,6 +242,13 @@ SWITCH_DECLARE(switch_status_t) switch_loadable_module_load_module(char *dir, char *fname, switch_bool_t runtime, const char **err); /*! + \brief Check if a module is loaded + \param mod the module name + \return the status +*/ +SWITCH_DECLARE(switch_status_t) switch_loadable_module_exists(const char *mod); + +/*! \brief Unoad a module \param dir the directory where the module resides \param fname the file name of the module Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (original) +++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c Thu Jul 10 10:41:31 2008 @@ -196,6 +196,21 @@ } +SWITCH_STANDARD_API(module_exists_function) +{ + if (!switch_strlen_zero(cmd)) { + if(switch_loadable_module_exists(cmd) == SWITCH_STATUS_SUCCESS) { + stream->write_function(stream, "true"); + } else { + stream->write_function(stream, "false"); + + } + } + + return SWITCH_STATUS_SUCCESS; +} + + SWITCH_STANDARD_API(url_encode_function) { char *reply = ""; @@ -2431,6 +2446,7 @@ SWITCH_ADD_API(commands_api_interface, "user_data", "find user data", user_data_function, "<user>@<domain> [var|param] <name>"); SWITCH_ADD_API(commands_api_interface, "url_encode", "url encode a string", url_encode_function, "<string>"); SWITCH_ADD_API(commands_api_interface, "url_decode", "url decode a string", url_decode_function, "<string>"); + SWITCH_ADD_API(commands_api_interface, "module_exists", "check if module exists", module_exists_function, "<module>"); /* indicate that the module should continue to be loaded */ return SWITCH_STATUS_NOUNLOAD; Modified: freeswitch/trunk/src/switch_loadable_module.c ============================================================================== --- freeswitch/trunk/src/switch_loadable_module.c (original) +++ freeswitch/trunk/src/switch_loadable_module.c Thu Jul 10 10:41:31 2008 @@ -830,7 +830,24 @@ } +SWITCH_DECLARE(switch_status_t) switch_loadable_module_exists(const char *mod) +{ + switch_status_t status; + + if (switch_strlen_zero(mod)) { + return SWITCH_STATUS_FALSE; + } + switch_mutex_lock(loadable_modules.mutex); + if (switch_core_hash_find(loadable_modules.module_hash, mod)) { + status = SWITCH_STATUS_SUCCESS; + } else { + status = SWITCH_STATUS_FALSE; + } + switch_mutex_unlock(loadable_modules.mutex); + + return status; +} SWITCH_DECLARE(switch_status_t) switch_loadable_module_unload_module(char *dir, char *fname, const char **err) {

1 0

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

10 Jul '08

Author: brian Date: Thu Jul 10 09:11:22 2008 New Revision: 8983 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 Thu Jul 10 09:11:22 2008 @@ -141,11 +141,11 @@ "-hmm", model, "-lm", lm, "-dict", dic, - "-bestpath", "20", + "-bestpath", "10", "-maxhmmpf", "2000", "-maxcdsenpf", "500", "-maxwpf", "3", - "-ds", "3", + "-ds", "2", #if 0 "-agc", "noise", "-beam", "1e-60",

1 0

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

10 Jul '08

Author: brian Date: Thu Jul 10 08:41:04 2008 New Revision: 8982 Modified: freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/Makefile freeswitch/trunk/src/mod/asr_tts/mod_pocketsphinx/mod_pocketsphinx.c Log: we now have more confidence 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 Thu Jul 10 08:41:04 2008 @@ -1,6 +1,6 @@ -SPHINXBASE=sphinxbase-0.4 +SPHINXBASE=sphinxbase-0.4.99 SPHINXBASE_DIR=$(switch_srcdir)/libs/$(SPHINXBASE) -POCKETSPHINX=pocketsphinx-0.5 +POCKETSPHINX=pocketsphinx-0.5.99 POCKETSPHINX_DIR=$(switch_srcdir)/libs/$(POCKETSPHINX) SPHINXBASE_LA=$(SPHINXBASE_DIR)/src/libsphinxbase/libsphinxbase.la SPHINXBASE_LA2=$(SPHINXBASE_DIR)/src/libsphinxad/libsphinxad.la 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 Thu Jul 10 08:41:04 2008 @@ -69,6 +69,8 @@ char *hyp; char *grammar; int32_t score; + int32_t confidence; + char const *uttid; cmd_ln_t *config; } pocketsphinx_t; @@ -135,19 +137,21 @@ ps->config = cmd_ln_init(ps->config, ps_args(), FALSE, "-samprate", "8000", + "-adcin", "yes", "-hmm", model, "-lm", lm, "-dict", dic, + "-bestpath", "20", + "-maxhmmpf", "2000", + "-maxcdsenpf", "500", + "-maxwpf", "3", + "-ds", "3", #if 0 "-agc", "noise", "-beam", "1e-60", "-wbeam", "1e-40", "-ci_pbeam", "1e-8", "-subvqbeam", "1e-2", - "-maxhmmpf", "10000", - "-maxcdsenpf", "1000", - "-maxwpf", "8", - "-ds", "2", #endif NULL); @@ -192,7 +196,7 @@ /*! function to close the asr interface */ static switch_status_t pocketsphinx_asr_close(switch_asr_handle_t *ah, switch_asr_flag_t *flags) { - char const *hyp, *uttid; + char const *hyp; int32_t score; pocketsphinx_t *ps = (pocketsphinx_t *) ah->private_info; @@ -200,7 +204,7 @@ if (switch_test_flag(ps, PSFLAG_ALLOCATED)) { if (switch_test_flag(ps, PSFLAG_READY)) { ps_end_utt(ps->ps); - hyp = ps_get_hyp(ps->ps, &score, &uttid); + hyp = ps_get_hyp(ps->ps, &score, &ps->uttid); } ps_free(ps->ps); ps->ps = NULL; @@ -272,14 +276,14 @@ } if (stop_detect(ps, (int16_t *)data, len / 2)) { - char const *hyp, *uttid; + char const *hyp; switch_mutex_lock(ps->flag_mutex); - if ((hyp = ps_get_hyp(ps->ps, &ps->score, &uttid))) { + if ((hyp = ps_get_hyp(ps->ps, &ps->score, &ps->uttid))) { if (!switch_strlen_zero(hyp)) { ps_end_utt(ps->ps); switch_clear_flag(ps, PSFLAG_READY); - if ((hyp = ps_get_hyp(ps->ps, &ps->score, &uttid))) { + if ((hyp = ps_get_hyp(ps->ps, &ps->score, &ps->uttid))) { if (switch_strlen_zero(hyp)) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Lost the text, nevermind....\n"); ps_start_utt(ps->ps, NULL); @@ -350,6 +354,7 @@ { pocketsphinx_t *ps = (pocketsphinx_t *) ah->private_info; switch_status_t status = SWITCH_STATUS_SUCCESS; + int32_t score; if (switch_test_flag(ps, PSFLAG_BARGE)) { switch_clear_flag_locked(ps, PSFLAG_BARGE); @@ -359,12 +364,11 @@ if (switch_test_flag(ps, PSFLAG_HAS_TEXT)) { switch_mutex_lock(ps->flag_mutex); switch_clear_flag(ps, PSFLAG_HAS_TEXT); + + score = ps_get_prob(ps->ps, &ps->uttid); + ps->confidence = score - score - score / 1000; - 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_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Recognized: %s, Score: %d\n", ps->hyp, ps->confidence); switch_mutex_unlock(ps->flag_mutex); /* ps->score isn't a confidence score. PocketSphinx doesn't support that yet. */ @@ -373,7 +377,7 @@ " <result name=\"%s\">%s</result>\n" " <input>%s</input>\n" "</interpretation>", - ps->grammar, ps->score, + ps->grammar, ps->confidence, "match", ps->hyp, ps->hyp

1 0