diff --git a/src/include/switch_core.h b/src/include/switch_core.h index 5db2487ac5..6c220e469b 100644 --- a/src/include/switch_core.h +++ b/src/include/switch_core.h @@ -770,7 +770,7 @@ SWITCH_DECLARE(switch_status) switch_core_speech_open(switch_speech_handle *sh, char *module_name, char *voice_name, int rate, - unsigned int flags, + switch_speech_flag flags, switch_memory_pool *pool); /*! @@ -782,7 +782,7 @@ SWITCH_DECLARE(switch_status) switch_core_speech_open(switch_speech_handle *sh, \param flags flags in/out for fine tuning \return SWITCH_STATUS_SUCCESS with possible new flags on success */ -SWITCH_DECLARE(switch_status) switch_core_speech_feed_asr(switch_speech_handle *sh, void *data, unsigned int *len, int rate, unsigned int *flags); +SWITCH_DECLARE(switch_status) switch_core_speech_feed_asr(switch_speech_handle *sh, void *data, unsigned int *len, int rate, switch_speech_flag *flags); /*! \brief Get text back from the ASR module @@ -792,7 +792,7 @@ SWITCH_DECLARE(switch_status) switch_core_speech_feed_asr(switch_speech_handle * \param flags flags in/out for fine tuning \return SWITCH_STATUS_SUCCESS with possible new flags on success */ -SWITCH_DECLARE(switch_status) switch_core_speech_interpret_asr(switch_speech_handle *sh, char *buf, unsigned int buflen, unsigned int *flags); +SWITCH_DECLARE(switch_status) switch_core_speech_interpret_asr(switch_speech_handle *sh, char *buf, unsigned int buflen, switch_speech_flag *flags); /*! \brief Feed text to the TTS module diff --git a/src/include/switch_module_interfaces.h b/src/include/switch_module_interfaces.h index e025e9d3fc..d7277873ed 100644 --- a/src/include/switch_module_interfaces.h +++ b/src/include/switch_module_interfaces.h @@ -288,13 +288,13 @@ struct switch_speech_interface { switch_status (*speech_open)(switch_speech_handle *sh, char *voice_name, int rate, - unsigned int flags); + switch_speech_flag flags); /*! function to close the speech interface */ switch_status (*speech_close)(switch_speech_handle *, switch_speech_flag *flags); /*! function to feed audio to the ASR*/ - switch_status (*speech_feed_asr)(switch_speech_handle *sh, void *data, unsigned int *len, int rate, unsigned int *flags); + switch_status (*speech_feed_asr)(switch_speech_handle *sh, void *data, unsigned int *len, int rate, switch_speech_flag *flags); /*! function to read text from the ASR*/ - switch_status (*speech_interpret_asr)(switch_speech_handle *sh, char *buf, unsigned int buflen, unsigned int *flags); + switch_status (*speech_interpret_asr)(switch_speech_handle *sh, char *buf, unsigned int buflen, switch_speech_flag *flags); /*! function to feed text to the TTS*/ switch_status (*speech_feed_tts)(switch_speech_handle *sh, char *text, switch_speech_flag *flags); /*! function to read audio from the TTS*/ diff --git a/src/mod/asr_tts/mod_cepstral/mod_cepstral.c b/src/mod/asr_tts/mod_cepstral/mod_cepstral.c index 54ff6a4228..cee9fff7d8 100644 --- a/src/mod/asr_tts/mod_cepstral/mod_cepstral.c +++ b/src/mod/asr_tts/mod_cepstral/mod_cepstral.c @@ -75,7 +75,7 @@ static swift_result_t write_audio(swift_event *event, swift_event_t type, void * return rv; } -static switch_status cepstral_speech_open(switch_speech_handle *sh, char *voice_name, int rate, unsigned int flags) +static switch_status cepstral_speech_open(switch_speech_handle *sh, char *voice_name, int rate, switch_speech_flag flags) { if (flags & SWITCH_SPEECH_FLAG_ASR) { return SWITCH_STATUS_FALSE; @@ -139,7 +139,7 @@ static switch_status cepstral_speech_open(switch_speech_handle *sh, char *voice_ return SWITCH_STATUS_FALSE; } -static switch_status cepstral_speech_close(switch_speech_handle *sh, unsigned int *flags) +static switch_status cepstral_speech_close(switch_speech_handle *sh, switch_speech_flag *flags) { cepstral_t *cepstral; @@ -157,7 +157,7 @@ static switch_status cepstral_speech_close(switch_speech_handle *sh, unsigned in return SWITCH_STATUS_SUCCESS; } -static switch_status cepstral_speech_feed_tts(switch_speech_handle *sh, char *text, unsigned int *flags) +static switch_status cepstral_speech_feed_tts(switch_speech_handle *sh, char *text, switch_speech_flag *flags) { cepstral_t *cepstral; @@ -177,12 +177,12 @@ static switch_status cepstral_speech_read_tts(switch_speech_handle *sh, void *data, unsigned int *datalen, unsigned int *rate, - unsigned int *flags) + switch_speech_flag *flags) { cepstral_t *cepstral; - int desired = *datalen; + size_t desired = *datalen; switch_status status = SWITCH_STATUS_FALSE; - int used, padding = 0; + size_t used, padding = 0; assert(sh != NULL); cepstral = sh->private_info; @@ -224,7 +224,7 @@ static switch_status cepstral_speech_read_tts(switch_speech_handle *sh, switch_mutex_lock(cepstral->audio_lock); *datalen = switch_buffer_read(cepstral->audio_buffer, data, desired); if (padding) { - int x = 0; + size_t x = 0; unsigned char *p = data; for(x = 0; x < padding; x++) { diff --git a/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj b/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj new file mode 100644 index 0000000000..9a2645a0a0 --- /dev/null +++ b/src/mod/asr_tts/mod_cepstral/mod_cepstral.vcproj @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/switch_core.c b/src/switch_core.c index 1aecfd3c3e..fcb6b6001b 100644 --- a/src/switch_core.c +++ b/src/switch_core.c @@ -477,7 +477,7 @@ SWITCH_DECLARE(switch_status) switch_core_speech_open(switch_speech_handle *sh, char *module_name, char *voice_name, int rate, - unsigned int flags, + switch_speech_flag flags, switch_memory_pool *pool) { switch_status status; @@ -500,14 +500,14 @@ SWITCH_DECLARE(switch_status) switch_core_speech_open(switch_speech_handle *sh, return sh->speech_interface->speech_open(sh, voice_name, rate, flags); } -SWITCH_DECLARE(switch_status) switch_core_speech_feed_asr(switch_speech_handle *sh, void *data, unsigned int *len, int rate, unsigned int *flags) +SWITCH_DECLARE(switch_status) switch_core_speech_feed_asr(switch_speech_handle *sh, void *data, unsigned int *len, int rate, switch_speech_flag *flags) { assert(sh != NULL); return sh->speech_interface->speech_feed_asr(sh, data, len, rate, flags); } -SWITCH_DECLARE(switch_status) switch_core_speech_interpret_asr(switch_speech_handle *sh, char *buf, unsigned int buflen, unsigned int *flags) +SWITCH_DECLARE(switch_status) switch_core_speech_interpret_asr(switch_speech_handle *sh, char *buf, unsigned int buflen, switch_speech_flag *flags) { assert(sh != NULL); diff --git a/w32/vsnet/Freeswitch.sln b/w32/vsnet/Freeswitch.sln index 469b068e1d..3efea681ef 100644 --- a/w32/vsnet/Freeswitch.sln +++ b/w32/vsnet/Freeswitch.sln @@ -154,6 +154,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_spidermonkey", "..\..\s {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ASR-TTS", "ASR-TTS", "{4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_cepstral", "..\..\src\mod\asr_tts\mod_cepstral\mod_cepstral.vcproj", "{692F6330-4D87-4C82-81DF-40DB5892636E}" + ProjectSection(ProjectDependencies) = postProject + {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} = {202D7A4E-760D-4D0E-AFA1-D7459CED30FF} + EndProjectSection +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -270,6 +277,8 @@ Global {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Debug|Win32.Build.0 = Debug|Win32 {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|Win32.ActiveCfg = Release|Win32 {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F}.Release|Win32.Build.0 = Release|Win32 + {692F6330-4D87-4C82-81DF-40DB5892636E}.Debug|Win32.ActiveCfg = Debug|Win32 + {692F6330-4D87-4C82-81DF-40DB5892636E}.Release|Win32.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -299,5 +308,6 @@ Global {1A1FF289-4FD6-4285-A422-D31DD67A4723} = {CBD81696-EFB4-4D2F-8451-1B8DAA86155A} {EC3E5C7F-EE09-47E2-80FE-546363D14A98} = {B8F5B47B-8568-46EB-B320-64C17D2A98BC} {1AD3F51E-BBB6-4090-BA39-9DFAB1EF1F5F} = {0C808854-54D1-4230-BFF5-77B5FD905000} + {692F6330-4D87-4C82-81DF-40DB5892636E} = {4CF6A6AC-07DE-4B9E-ABE1-7F98B64E0BB0} EndGlobalSection EndGlobal