Skip to content

F
freeswitch
提交 d3078c60 authored 作者: Jeff Lenk's avatar Jeff Lenk
浏览文件
操作

update flite to 1.5.4 fixes win64 and kal rate problem

上级 72bb1969
全部展开 隐藏空白字符变更
内嵌 并排
正在显示 包含 1048 行增加 和 751 行删除
libs/win32/Download FLITE.2008.vcproj
浏览文件 @ d3078c60
...@@ -76,8 +76,8 @@ ...@@ -76,8 +76,8 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Downloading Flite." Description="Downloading Flite."
CommandLine="if not exist &quot;$(ProjectDir)..\flite-1.3.99&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/downloads/libs/flite-1.3.99-latest.tar.gz &quot;$(ProjectDir)..&quot;&#x0D;&#x0A;" CommandLine="if not exist &quot;$(ProjectDir)..\flite-1.5.4&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/downloads/libs/flite-1.5.4-current.tar.bz2 &quot;$(ProjectDir)..&quot;&#x0D;&#x0A;&#x0A;if exist &quot;$(ProjectDir)..\flite-1.5.4-current&quot; move &quot;$(ProjectDir)..\flite-1.5.4-current&quot; &quot;$(ProjectDir)..\flite-1.5.4&quot;&#x0A;&#x0D;&#x0A;"
Outputs="$(ProjectDir)..\flite-1.3.99" Outputs="$(ProjectDir)..\flite-1.5.4"
/> />
</FileConfiguration> </FileConfiguration>
<FileConfiguration <FileConfiguration
...@@ -86,8 +86,8 @@ ...@@ -86,8 +86,8 @@
<Tool <Tool
Name="VCCustomBuildTool" Name="VCCustomBuildTool"
Description="Downloading Flite." Description="Downloading Flite."
CommandLine="if not exist &quot;$(ProjectDir)..\flite-1.3.99&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/downloads/libs/flite-1.3.99-latest.tar.gz &quot;$(ProjectDir)..&quot;&#x0D;&#x0A;" CommandLine="if not exist &quot;$(ProjectDir)..\flite-1.5.4&quot; cscript /nologo &quot;$(ProjectDir)util.vbs&quot; GetUnzip http://files.freeswitch.org/downloads/libs/flite-1.5.4-current.tar.bz2 &quot;$(ProjectDir)..&quot;&#x0D;&#x0A;&#x0A;if exist &quot;$(ProjectDir)..\flite-1.5.4-current&quot; move &quot;$(ProjectDir)..\flite-1.5.4-current&quot; &quot;$(ProjectDir)..\flite-1.5.4&quot;&#x0A;&#x0D;&#x0A;"
Outputs="$(ProjectDir)..\flite-1.3.99" Outputs="$(ProjectDir)..\flite-1.5.4"
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
......
libs/win32/Download FLITE.2010.vcxproj
浏览文件 @ d3078c60
...@@ -66,13 +66,15 @@ ...@@ -66,13 +66,15 @@
<CustomBuild Include="cleancount"> <CustomBuild Include="cleancount">
<FileType>Document</FileType> <FileType>Document</FileType>
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Downloading Flite.</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Downloading Flite.</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\flite-1.3.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/flite-1.3.99-latest.tar.gz "$(ProjectDir).." <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\flite-1.5.4" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/flite-1.5.4-current.tar.bz2 "$(ProjectDir).."
if exist "$(ProjectDir)..\flite-1.5.4-current" move "$(ProjectDir)..\flite-1.5.4-current" "$(ProjectDir)..\flite-1.5.4"
</Command> </Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\flite-1.3.99;%(Outputs)</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)..\flite-1.5.4;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Downloading Flite.</Message> <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Downloading Flite.</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">if not exist "$(ProjectDir)..\flite-1.3.99" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/flite-1.3.99-latest.tar.gz "$(ProjectDir).." <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">if not exist "$(ProjectDir)..\flite-1.5.4" cscript /nologo "$(ProjectDir)util.vbs" GetUnzip http://files.freeswitch.org/downloads/libs/flite-1.5.4-current.tar.bz2 "$(ProjectDir).."
if exist "$(ProjectDir)..\flite-1.5.4-current" move "$(ProjectDir)..\flite-1.5.4-current" "$(ProjectDir)..\flite-1.5.4"
</Command> </Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\flite-1.3.99;%(Outputs)</Outputs> <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)..\flite-1.5.4;%(Outputs)</Outputs>
</CustomBuild> </CustomBuild>
</ItemGroup> </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
......
src/mod/asr_tts/mod_flite/Makefile
浏览文件 @ d3078c60
FLITE=flite-1.5.1 FLITE=flite-1.5.4
FLITE_DIR=$(switch_srcdir)/libs/$(FLITE)-current FLITE_DIR=$(switch_srcdir)/libs/$(FLITE)-current
FLITE_BUILDDIR=$(switch_builddir)/libs/$(FLITE)-current FLITE_BUILDDIR=$(switch_builddir)/libs/$(FLITE)-current
......
src/mod/asr_tts/mod_flite/mod_flite.2008.vcproj
浏览文件 @ d3078c60
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../../../libs/flite-1.3.99/include" AdditionalIncludeDirectories="../../../../libs/flite-1.5.4/include"
PreprocessorDefinitions="APT_LIB_EXPORT" PreprocessorDefinitions="APT_LIB_EXPORT"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../../../libs/flite-1.3.99/include" AdditionalIncludeDirectories="../../../../libs/flite-1.5.4/include"
PreprocessorDefinitions="APT_LIB_EXPORT" PreprocessorDefinitions="APT_LIB_EXPORT"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
...@@ -175,7 +175,7 @@ ...@@ -175,7 +175,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../../../libs/flite-1.3.99/include" AdditionalIncludeDirectories="../../../../libs/flite-1.5.4/include"
PreprocessorDefinitions="APT_LIB_EXPORT" PreprocessorDefinitions="APT_LIB_EXPORT"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
...@@ -241,7 +241,7 @@ ...@@ -241,7 +241,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../../../libs/flite-1.3.99/include" AdditionalIncludeDirectories="../../../../libs/flite-1.5.4/include"
PreprocessorDefinitions="APT_LIB_EXPORT" PreprocessorDefinitions="APT_LIB_EXPORT"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
...@@ -308,7 +308,7 @@ ...@@ -308,7 +308,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../../../libs/flite-1.3.99/include" AdditionalIncludeDirectories="../../../../libs/flite-1.5.4/include"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
<Tool <Tool
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../../../libs/flite-1.3.99/include" AdditionalIncludeDirectories="../../../../libs/flite-1.5.4/include"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
<Tool <Tool
...@@ -440,7 +440,7 @@ ...@@ -440,7 +440,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../../../libs/flite-1.3.99/include" AdditionalIncludeDirectories="../../../../libs/flite-1.5.4/include"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
<Tool <Tool
...@@ -507,7 +507,7 @@ ...@@ -507,7 +507,7 @@
/> />
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalIncludeDirectories="../../../../libs/flite-1.3.99/include" AdditionalIncludeDirectories="../../../../libs/flite-1.5.4/include"
UsePrecompiledHeader="0" UsePrecompiledHeader="0"
/> />
<Tool <Tool
......
src/mod/asr_tts/mod_flite/mod_flite.2010.vcxproj
浏览文件 @ d3078c60
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
</PropertyGroup> </PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>../../../../libs/flite-1.3.99/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../../../libs/flite-1.5.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>APT_LIB_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>APT_LIB_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
<TargetEnvironment>X64</TargetEnvironment> <TargetEnvironment>X64</TargetEnvironment>
</Midl> </Midl>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>../../../../libs/flite-1.3.99/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../../../libs/flite-1.5.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>APT_LIB_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>APT_LIB_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>../../../../libs/flite-1.3.99/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../../../libs/flite-1.5.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>APT_LIB_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>APT_LIB_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
<TargetEnvironment>X64</TargetEnvironment> <TargetEnvironment>X64</TargetEnvironment>
</Midl> </Midl>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>../../../../libs/flite-1.3.99/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../../../libs/flite-1.5.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>APT_LIB_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>APT_LIB_EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug Static|Win32'">
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>../../../../libs/flite-1.3.99/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../../../libs/flite-1.5.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
</ClCompile> </ClCompile>
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
<TargetEnvironment>X64</TargetEnvironment> <TargetEnvironment>X64</TargetEnvironment>
</Midl> </Midl>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>../../../../libs/flite-1.3.99/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../../../libs/flite-1.5.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
</ClCompile> </ClCompile>
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release Static|Win32'">
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>../../../../libs/flite-1.3.99/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../../../libs/flite-1.5.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
</ClCompile> </ClCompile>
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
<TargetEnvironment>X64</TargetEnvironment> <TargetEnvironment>X64</TargetEnvironment>
</Midl> </Midl>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>../../../../libs/flite-1.3.99/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>../../../../libs/flite-1.5.4/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader> <PrecompiledHeader>
</PrecompiledHeader> </PrecompiledHeader>
</ClCompile> </ClCompile>
...@@ -258,7 +258,6 @@ ...@@ -258,7 +258,6 @@
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\..\libs\win32\flite\flite.2010.vcxproj"> <ProjectReference Include="..\..\..\..\libs\win32\flite\flite.2010.vcxproj">
<Project>{0ad1177e-1fd8-4643-9391-431467a11084}</Project> <Project>{0ad1177e-1fd8-4643-9391-431467a11084}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2010.vcxproj"> <ProjectReference Include="..\..\..\..\w32\Library\FreeSwitchCore.2010.vcxproj">
<Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project> <Project>{202d7a4e-760d-4d0e-afa1-d7459ced30ff}</Project>
......
src/mod/asr_tts/mod_flite/mod_flite.c
浏览文件 @ d3078c60
...@@ -44,6 +44,10 @@ void unregister_cmu_us_rms(cst_voice * v); ...@@ -44,6 +44,10 @@ void unregister_cmu_us_rms(cst_voice * v);
cst_voice *register_cmu_us_slt(void); cst_voice *register_cmu_us_slt(void);
void unregister_cmu_us_slt(cst_voice * v); void unregister_cmu_us_slt(cst_voice * v);
cst_voice *register_cmu_us_kal16(void);
void unregister_cmu_us_kal16(cst_voice * v);
SWITCH_MODULE_LOAD_FUNCTION(mod_flite_load); SWITCH_MODULE_LOAD_FUNCTION(mod_flite_load);
SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_flite_shutdown); SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_flite_shutdown);
SWITCH_MODULE_DEFINITION(mod_flite, mod_flite_load, mod_flite_shutdown, NULL); SWITCH_MODULE_DEFINITION(mod_flite, mod_flite_load, mod_flite_shutdown, NULL);
...@@ -53,6 +57,7 @@ static struct { ...@@ -53,6 +57,7 @@ static struct {
cst_voice *kal; cst_voice *kal;
cst_voice *rms; cst_voice *rms;
cst_voice *slt; cst_voice *slt;
cst_voice *kal16;
} globals; } globals;
struct flite_data { struct flite_data {
...@@ -75,13 +80,18 @@ static switch_status_t flite_speech_open(switch_speech_handle_t *sh, const char ...@@ -75,13 +80,18 @@ static switch_status_t flite_speech_open(switch_speech_handle_t *sh, const char
if (!strcasecmp(voice_name, "awb")) { if (!strcasecmp(voice_name, "awb")) {
flite->v = globals.awb; flite->v = globals.awb;
} else if (!strcasecmp(voice_name, "kal")) { } else if (!strcasecmp(voice_name, "kal")) {
flite->v = globals.kal; /* "kal" is 8kHz and the native rate is set to 16kHz
* so kal talks a little bit too fast ...
* for now: "symlink" kal to kal16
*/ flite->v = globals.kal16;
} else if (!strcasecmp(voice_name, "rms")) { } else if (!strcasecmp(voice_name, "rms")) {
flite->v = globals.rms; flite->v = globals.rms;
} else if (!strcasecmp(voice_name, "slt")) { } else if (!strcasecmp(voice_name, "slt")) {
flite->v = globals.slt; flite->v = globals.slt;
} else if (!strcasecmp(voice_name, "kal16")) {
flite->v = globals.kal16;
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Valid voice names are awb, kal, rms or slt.\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Valid voice names are awb, rms, slt or kal.\n");
} }
if (flite->v) { if (flite->v) {
...@@ -179,6 +189,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_flite_load) ...@@ -179,6 +189,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_flite_load)
globals.kal = register_cmu_us_kal(); globals.kal = register_cmu_us_kal();
globals.rms = register_cmu_us_rms(); globals.rms = register_cmu_us_rms();
globals.slt = register_cmu_us_slt(); globals.slt = register_cmu_us_slt();
globals.kal16 = register_cmu_us_kal16();
/* connect my internal structure to the blank pointer passed to me */ /* connect my internal structure to the blank pointer passed to me */
*module_interface = switch_loadable_module_create_module_interface(pool, modname); *module_interface = switch_loadable_module_create_module_interface(pool, modname);
...@@ -203,6 +214,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_flite_shutdown) ...@@ -203,6 +214,7 @@ SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_flite_shutdown)
unregister_cmu_us_kal(globals.kal); unregister_cmu_us_kal(globals.kal);
unregister_cmu_us_rms(globals.rms); unregister_cmu_us_rms(globals.rms);
unregister_cmu_us_slt(globals.slt); unregister_cmu_us_slt(globals.slt);
unregister_cmu_us_kal16(globals.kal16);
return SWITCH_STATUS_UNLOAD; return SWITCH_STATUS_UNLOAD;
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论