<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][14104] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=14104">14104</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2009-07-01 19:54:48 -0500 (Wed, 01 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>commit e8f60761378fe392d80e89d0e3481316119e9809
Author: achaloyan <achaloyan@f001bc3a-424a-0410-80a0-a715b8f413a8>
Date: Tue Jun 30 14:44:09 2009 +0000
Further build and install integration
git-svn-id: https://unimrcp.googlecode.com/svn/trunk@1030 f001bc3a-424a-0410-80a0-a715b8f413a8
commit 5b410e0dfc1852ee5c0d56d64b326d5130aed18a
Author: achaloyan <achaloyan@f001bc3a-424a-0410-80a0-a715b8f413a8>
Date: Tue Jun 30 13:24:27 2009 +0000
Added utility project (preparesphinx) to copy the stuff pocketsphinx requires to run
git-svn-id: https://unimrcp.googlecode.com/svn/trunk@1029 f001bc3a-424a-0410-80a0-a715b8f413a8
commit 2457575de160b378affdfa7a37cac1282d0024ca
Author: achaloyan <achaloyan@f001bc3a-424a-0410-80a0-a715b8f413a8>
Date: Tue Jun 30 13:18:59 2009 +0000
Added a few more comments in config file
git-svn-id: https://unimrcp.googlecode.com/svn/trunk@1028 f001bc3a-424a-0410-80a0-a715b8f413a8
commit ffc40b15b409a79bdea286898ad1e8694fc1623c
Author: garmt.noname@gmail.com <garmt.noname@gmail.com@f001bc3a-424a-0410-80a0-a715b8f413a8>
Date: Tue Jun 30 10:38:54 2009 +0000
Added resampling to 8kHz so that it works with freeswitch (specify only L16/96/8000 codec in profile of media_engine/rtpfactory).
Changed logging to DEBUG level rather than INFO.
Added channel_guard for stop response.
git-svn-id: https://unimrcp.googlecode.com/svn/trunk@1027 f001bc3a-424a-0410-80a0-a715b8f413a8
commit d11439611186b46f1bfabc036b7e5d76f33f8b0e
Author: achaloyan <achaloyan@f001bc3a-424a-0410-80a0-a715b8f413a8>
Date: Mon Jun 29 19:46:54 2009 +0000
Added entries for PocketSphinx (mrcppocketsphinx) and Flite (mrcpflite) plugins into unimrcpserver.xml (disabled by default)
git-svn-id: https://unimrcp.googlecode.com/svn/trunk@1026 f001bc3a-424a-0410-80a0-a715b8f413a8
commit 63bc73426ba4efdf648a28cd3c1ff1daaef5bb49
Author: achaloyan <achaloyan@f001bc3a-424a-0410-80a0-a715b8f413a8>
Date: Mon Jun 29 15:04:01 2009 +0000
Added enumeration of pocketsphinx models (narrowband, wideband), supported wideband either
git-svn-id: https://unimrcp.googlecode.com/svn/trunk@1025 f001bc3a-424a-0410-80a0-a715b8f413a8
commit d11439611186b46f1bfabc036b7e5d76f33f8b0e
Author: achaloyan <achaloyan@f001bc3a-424a-0410-80a0-a715b8f413a8>
Date: Mon Jun 29 19:46:54 2009 +0000
Added entries for PocketSphinx (mrcppocketsphinx) and Flite (mrcpflite) plugins into unimrcpserver.xml (disabled by default)
git-svn-id: https://unimrcp.googlecode.com/svn/trunk@1026 f001bc3a-424a-0410-80a0-a715b8f413a8
commit 63bc73426ba4efdf648a28cd3c1ff1daaef5bb49
Author: achaloyan <achaloyan@f001bc3a-424a-0410-80a0-a715b8f413a8>
Date: Mon Jun 29 15:04:01 2009 +0000
Added enumeration of pocketsphinx models (narrowband, wideband), supported wideband either
git-svn-id: https://unimrcp.googlecode.com/svn/trunk@1025 f001bc3a-424a-0410-80a0-a715b8f413a8
commit 04970484e4357e2a1c3c4385840640caada33468
Author: achaloyan <achaloyan@f001bc3a-424a-0410-80a0-a715b8f413a8>
Date: Mon Jun 29 13:21:35 2009 +0000
Removed engine->guard, as all relevant calls are made within the context of the same thread
git-svn-id: https://unimrcp.googlecode.com/svn/trunk@1024 f001bc3a-424a-0410-80a0-a715b8f413a8
commit 9bac2f3abdcfea5397aca4b86e209af090631e7a
Author: achaloyan <achaloyan@f001bc3a-424a-0410-80a0-a715b8f413a8>
Date: Mon Jun 29 13:15:30 2009 +0000
Initialized 16kHz codec descriptor for flite channel, since available flite voice are in 16kHz.
git-svn-id: https://unimrcp.googlecode.com/svn/trunk@1023 f001bc3a-424a-0410-80a0-a715b8f413a8
commit 4e902eb985b433416723f15646d3e99d385d18cb
Author: achaloyan <achaloyan@f001bc3a-424a-0410-80a0-a715b8f413a8>
Date: Sun Jun 28 20:05:22 2009 +0000
Do not create bridge if resampling is required.
Several sampling rates are supported, but there is no resampling yet.
git-svn-id: https://unimrcp.googlecode.com/svn/trunk@1022 f001bc3a-424a-0410-80a0-a715b8f413a8
commit 6d35b1246a7061e4c8f3f608bb17e146870d63bd
Author: achaloyan <achaloyan@f001bc3a-424a-0410-80a0-a715b8f413a8>
Date: Sun Jun 28 18:14:25 2009 +0000
Added makefile target to install pocketsphinx.xml with make install
git-svn-id: https://unimrcp.googlecode.com/svn/trunk@1021 f001bc3a-424a-0410-80a0-a715b8f413a8
commit c2b75c89d57c02bd8d4360aebcb7406ecbf90eb0
Author: achaloyan <achaloyan@f001bc3a-424a-0410-80a0-a715b8f413a8>
Date: Sun Jun 28 18:10:01 2009 +0000
Set svn props (eol:native)
git-svn-id: https://unimrcp.googlecode.com/svn/trunk@1020 f001bc3a-424a-0410-80a0-a715b8f413a8
commit dd91ebea823dd2169e8c30f0cfe87fa199e1a0c2
Author: achaloyan <achaloyan@f001bc3a-424a-0410-80a0-a715b8f413a8>
Date: Sun Jun 28 17:46:46 2009 +0000
Loaded pocketsphinx's properties from config file
git-svn-id: https://unimrcp.googlecode.com/svn/trunk@1019 f001bc3a-424a-0410-80a0-a715b8f413a8
commit 2ba91890593d7a64136e675bb937efd9a2542cc7
Author: garmt.noname@gmail.com <garmt.noname@gmail.com@f001bc3a-424a-0410-80a0-a715b8f413a8>
Date: Sun Jun 28 12:29:54 2009 +0000
Removed session tasks, most channel tasks, flite voices are no longer global
git-svn-id: https://unimrcp.googlecode.com/svn/trunk@1018 f001bc3a-424a-0410-80a0-a715b8f413a8
commit 0d739127f9267b3ad871d1a53a863802f101a6b5
Author: achaloyan <achaloyan@f001bc3a-424a-0410-80a0-a715b8f413a8>
Date: Sat Jun 27 09:15:20 2009 +0000
Implemented save_waveform, utterance will be saved in the filesystem
git-svn-id: https://unimrcp.googlecode.com/svn/trunk@1017 f001bc3a-424a-0410-80a0-a715b8f413a8
commit 4ffd282ddf54ad861d73f36567ad201d135feff5
Author: achaloyan <achaloyan@f001bc3a-424a-0410-80a0-a715b8f413a8>
Date: Sat Jun 27 08:24:19 2009 +0000
Set 2 digits precision (digits after the decimal point) while generating float type values (<a href="http://jira.freeswitch.org/browse/Issue-35">Issue-35</a>).
git-svn-id: https://unimrcp.googlecode.com/svn/trunk@1016 f001bc3a-424a-0410-80a0-a715b8f413a8
commit 90446f5e6ece40e91fd5b340a45e6773e4e80a0f
Author: achaloyan <achaloyan@f001bc3a-424a-0410-80a0-a715b8f413a8>
Date: Sat Jun 27 07:42:52 2009 +0000
Set noinut and recognition timeouts if specified in RECOGNIZE request, reset input timer on partial match
git-svn-id: https://unimrcp.googlecode.com/svn/trunk@1015 f001bc3a-424a-0410-80a0-a715b8f413a8</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsunimrcpupdate">freeswitch/trunk/libs/unimrcp/.update</a></li>
<li><a href="#freeswitchtrunklibsunimrcpbuildacmacrosflitem4">freeswitch/trunk/libs/unimrcp/build/acmacros/flite.m4</a></li>
<li><a href="#freeswitchtrunklibsunimrcpbuildacmacrospocketsphinxm4">freeswitch/trunk/libs/unimrcp/build/acmacros/pocketsphinx.m4</a></li>
<li><a href="#freeswitchtrunklibsunimrcpconfunimrcpserverxml">freeswitch/trunk/libs/unimrcp/conf/unimrcpserver.xml</a></li>
<li><a href="#freeswitchtrunklibsunimrcplibsaprtoolkitincludeapt_text_streamh">freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_text_stream.h</a></li>
<li><a href="#freeswitchtrunklibsunimrcplibsmpfsrcmpf_contextc">freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_context.c</a></li>
<li><a href="#freeswitchtrunklibsunimrcppluginsmrcpflitesrcmrcp_flitec">freeswitch/trunk/libs/unimrcp/plugins/mrcp-flite/src/mrcp_flite.c</a></li>
<li><a href="#freeswitchtrunklibsunimrcppluginsmrcppocketsphinxMakefileam">freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/Makefile.am</a></li>
<li><a href="#freeswitchtrunklibsunimrcppluginsmrcppocketsphinxmrcppocketsphinxvcproj">freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/mrcppocketsphinx.vcproj</a></li>
<li><a href="#freeswitchtrunklibsunimrcppluginsmrcppocketsphinxsrcmrcp_pocketsphinxc">freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/src/mrcp_pocketsphinx.c</a></li>
<li><a href="#freeswitchtrunklibsunimrcpunimrcpsln">freeswitch/trunk/libs/unimrcp/unimrcp.sln</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsunimrcpbuildtoolspreparesphinxvcproj">freeswitch/trunk/libs/unimrcp/build/tools/preparesphinx.vcproj</a></li>
<li>freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/conf/</li>
<li><a href="#freeswitchtrunklibsunimrcppluginsmrcppocketsphinxconfpocketsphinxxml">freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/conf/pocketsphinx.xml</a></li>
<li>freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/include/</li>
<li><a href="#freeswitchtrunklibsunimrcppluginsmrcppocketsphinxincludepocketsphinx_propertiesh">freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/include/pocketsphinx_properties.h</a></li>
<li><a href="#freeswitchtrunklibsunimrcppluginsmrcppocketsphinxsrcpocketsphinx_propertiesc">freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/src/pocketsphinx_properties.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibsunimrcpupdate"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/unimrcp/.update (14103 => 14104)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/unimrcp/.update 2009-07-02 00:24:29 UTC (rev 14103)
+++ freeswitch/trunk/libs/unimrcp/.update 2009-07-02 00:54:48 UTC (rev 14104)
</span><span class="lines">@@ -1 +1 @@
</span><del>-Fri Jun 26 15:16:40 CDT 2009
</del><ins>+Wed Jul 1 19:53:07 CDT 2009
</ins></span></pre></div>
<a id="freeswitchtrunklibsunimrcpbuildacmacrosflitem4"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/unimrcp/build/acmacros/flite.m4 (14103 => 14104)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/unimrcp/build/acmacros/flite.m4 2009-07-02 00:24:29 UTC (rev 14103)
+++ freeswitch/trunk/libs/unimrcp/build/acmacros/flite.m4 2009-07-02 00:54:48 UTC (rev 14104)
</span><span class="lines">@@ -6,15 +6,13 @@
</span><span class="cx">
</span><span class="cx"> AC_MSG_CHECKING([for Flite])
</span><span class="cx"> AC_ARG_WITH(flite,
</span><del>- [ --with-flite=PATH prefix for installed Flite or
- path to Flite build tree],
</del><ins>+ [ --with-flite=PATH path to Flite build tree],
</ins><span class="cx"> [flite_path=$withval],
</span><del>- [flite_path="/usr/local"]
</del><ins>+ [flite_path="/usr/src/flite"]
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> found_flite="no"
</span><span class="cx">
</span><del>- dnl TO BE DONE
</del><span class="cx"> flite_libdir="build/libs"
</span><span class="cx"> for dir in $flite_path ; do
</span><span class="cx"> cd $dir && flite_dir=`pwd` && cd - > /dev/null
</span></span></pre></div>
<a id="freeswitchtrunklibsunimrcpbuildacmacrospocketsphinxm4"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/unimrcp/build/acmacros/pocketsphinx.m4 (14103 => 14104)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/unimrcp/build/acmacros/pocketsphinx.m4 2009-07-02 00:24:29 UTC (rev 14103)
+++ freeswitch/trunk/libs/unimrcp/build/acmacros/pocketsphinx.m4 2009-07-02 00:54:48 UTC (rev 14104)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> found_pocketsphinx="yes"
</span><span class="cx"> UNIMRCP_POCKETSPHINX_INCLUDES="`pkg-config --cflags $dir/$pocketsphinx_config`"
</span><span class="cx"> UNIMRCP_POCKETSPHINX_LIBS="`pkg-config --libs $dir/$pocketsphinx_config`"
</span><ins>+ UNIMRCP_POCKETSPHINX_MODELS=
</ins><span class="cx"> pocketsphinx_version="`pkg-config --modversion $dir/$pocketsphinx_config`"
</span><span class="cx"> break
</span><span class="cx"> fi
</span><span class="lines">@@ -28,6 +29,7 @@
</span><span class="cx"> found_pocketsphinx="yes"
</span><span class="cx"> UNIMRCP_POCKETSPHINX_INCLUDES="-I$pocketsphinx_dir/include"
</span><span class="cx"> UNIMRCP_POCKETSPHINX_LIBS="$pocketsphinx_dir/$pocketsphinx_srcdir/libpocketsphinx/libpocketsphinx.la"
</span><ins>+ UNIMRCP_POCKETSPHINX_MODELS="$pocketsphinx_dir/model"
</ins><span class="cx"> pocketsphinx_version="`pkg-config --modversion $pocketsphinx_dir/pocketsphinx.pc`"
</span><span class="cx"> break
</span><span class="cx"> fi
</span><span class="lines">@@ -46,5 +48,6 @@
</span><span class="cx">
</span><span class="cx"> AC_SUBST(UNIMRCP_POCKETSPHINX_INCLUDES)
</span><span class="cx"> AC_SUBST(UNIMRCP_POCKETSPHINX_LIBS)
</span><ins>+ AC_SUBST(UNIMRCP_POCKETSPHINX_MODELS)
</ins><span class="cx"> fi
</span><span class="cx"> ])
</span></span></pre></div>
<a id="freeswitchtrunklibsunimrcpbuildtoolspreparesphinxvcproj"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/libs/unimrcp/build/tools/preparesphinx.vcproj (0 => 14104)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/unimrcp/build/tools/preparesphinx.vcproj (rev 0)
+++ freeswitch/trunk/libs/unimrcp/build/tools/preparesphinx.vcproj 2009-07-02 00:54:48 UTC (rev 14104)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="preparesphinx"
+ ProjectGUID="{71D62A04-8EF6-4C6B-AC12-0C15A875E53A}"
+ RootNamespace="preparesphinx"
+ Keyword="Win32Proj"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Debug|Win32"
+ OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+ IntermediateDirectory="$(ConfigurationName)"
+ ConfigurationType="10"
+ InheritedPropertySheets="$(ProjectDir)..\..\build\vsprops\pocketsphinx.vsprops"
+ CharacterSet="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="xcopy &quot;$(PocketSphinxDir)\bin\$(ConfigurationName)\pocketsphinx.dll&quot; &quot;$(SolutionDir)$(ConfigurationName)\bin\&quot; /Y&#x0D;&#x0A;xcopy &quot;$(SphinxBaseDir)\lib\$(ConfigurationName)\sphinxbase.dll&quot; &quot;$(SolutionDir)$(ConfigurationName)\bin\&quot; /Y&#x0D;&#x0A;&#x0D;&#x0A;xcopy &quot;$(PocketSphinxDir)\model\hmm\wsj1\*&quot; &quot;$(SolutionDir)$(ConfigurationName)\data\wsj1\&quot; /Y&#x0D;&#x0A;copy &quot;$(PocketSphinxDir)\model\lm\cmudict.0.6d&quot; &quot;$(SolutionDir)$(ConfigurationName)\data\default.dic&quot;&#x0D;&#x0A;&#x0D;&#x0A;if not exist &quot;$(SolutionDir)$(ConfigurationName)\conf\pocketsphinx.xml&quot; xcopy &quot;$(SolutionDir)plugins\mrcp-pocketsphinx\conf\pocketsphinx.xml&quot; &quot;$(SolutionDir)$(ConfigurationName)\conf\&quot; /Y&#x0D;&#x0A;"
+ ExcludedFromBuild="false"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|Win32"
+ ConfigurationType="10"
+ InheritedPropertySheets="$(ProjectDir)..\..\build\vsprops\pocketsphinx.vsprops"
+ CharacterSet="1"
+ WholeProgramOptimization="1"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ CommandLine="xcopy &quot;$(PocketSphinxDir)\bin\$(ConfigurationName)\pocketsphinx.dll&quot; &quot;$(SolutionDir)$(ConfigurationName)\bin\&quot; /Y&#x0D;&#x0A;xcopy &quot;$(SphinxBaseDir)\lib\$(ConfigurationName)\sphinxbase.dll&quot; &quot;$(SolutionDir)$(ConfigurationName)\bin\&quot; /Y&#x0D;&#x0A;&#x0D;&#x0A;xcopy &quot;$(PocketSphinxDir)\model\hmm\wsj1\*&quot; &quot;$(SolutionDir)$(ConfigurationName)\data\wsj1\&quot; /Y&#x0D;&#x0A;copy &quot;$(PocketSphinxDir)\model\lm\cmudict.0.6d&quot; &quot;$(SolutionDir)$(ConfigurationName)\data\default.dic&quot;&#x0D;&#x0A;&#x0D;&#x0A;if not exist &quot;$(SolutionDir)$(ConfigurationName)\conf\pocketsphinx.xml&quot; xcopy &quot;$(SolutionDir)plugins\mrcp-pocketsphinx\conf\pocketsphinx.xml&quot; &quot;$(SolutionDir)$(ConfigurationName)\conf\&quot; /Y&#x0D;&#x0A;"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
</ins></span></pre></div>
<a id="freeswitchtrunklibsunimrcpconfunimrcpserverxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/unimrcp/conf/unimrcpserver.xml (14103 => 14104)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/unimrcp/conf/unimrcpserver.xml 2009-07-02 00:24:29 UTC (rev 14103)
+++ freeswitch/trunk/libs/unimrcp/conf/unimrcpserver.xml 2009-07-02 00:54:48 UTC (rev 14104)
</span><span class="lines">@@ -54,6 +54,8 @@
</span><span class="cx"> <!-- Resource plugins -->
</span><span class="cx"> <plugin>
</span><span class="cx"> <engine name="Cepstral-Swift-1" class="mrcpcepstral" enable="0"/>
</span><ins>+ <engine name="PocketSphinx-1" class="mrcppocketsphinx" enable="0"/>
+ <engine name="Flite-1" class="mrcpflite" enable="0"/>
</ins><span class="cx"> <engine name="Demo-Synth-1" class="demosynth" enable="1"/>
</span><span class="cx"> <engine name="Demo-Recog-1" class="demorecog" enable="1"/>
</span><span class="cx"> </plugin>
</span></span></pre></div>
<a id="freeswitchtrunklibsunimrcplibsaprtoolkitincludeapt_text_streamh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_text_stream.h (14103 => 14104)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_text_stream.h 2009-07-02 00:24:29 UTC (rev 14103)
+++ freeswitch/trunk/libs/unimrcp/libs/apr-toolkit/include/apt_text_stream.h 2009-07-02 00:54:48 UTC (rev 14104)
</span><span class="lines">@@ -122,7 +122,7 @@
</span><span class="cx"> /** Generate float value */
</span><span class="cx"> static APR_INLINE apt_bool_t apt_float_value_generate(float value, apt_text_stream_t *stream)
</span><span class="cx"> {
</span><del>- int length = sprintf(stream->pos,"%.1f",value);
</del><ins>+ int length = sprintf(stream->pos,"%.2f",value);
</ins><span class="cx"> if(length <= 0) {
</span><span class="cx"> return FALSE;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunklibsunimrcplibsmpfsrcmpf_contextc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_context.c (14103 => 14104)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_context.c 2009-07-02 00:24:29 UTC (rev 14103)
+++ freeswitch/trunk/libs/unimrcp/libs/mpf/src/mpf_context.c 2009-07-02 00:54:48 UTC (rev 14104)
</span><span class="lines">@@ -208,6 +208,12 @@
</span><span class="cx"> object = mpf_null_bridge_create(source,sink,context->pool);
</span><span class="cx"> }
</span><span class="cx"> else {
</span><ins>+ if(rx_codec->descriptor->sampling_rate != tx_codec->descriptor->sampling_rate) {
+ apt_log(APT_LOG_MARK,APT_PRIO_WARNING,
+ "Resampling is not supported now. "
+ "Try to configure and use the same sampling rate on both ends");
+ return NULL;
+ }
</ins><span class="cx"> if(rx_codec->vtable && rx_codec->vtable->decode) {
</span><span class="cx"> /* set decoder before bridge */
</span><span class="cx"> mpf_audio_stream_t *decoder = mpf_decoder_create(source,context->pool);
</span></span></pre></div>
<a id="freeswitchtrunklibsunimrcppluginsmrcpflitesrcmrcp_flitec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/unimrcp/plugins/mrcp-flite/src/mrcp_flite.c (14103 => 14104)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/unimrcp/plugins/mrcp-flite/src/mrcp_flite.c 2009-07-02 00:24:29 UTC (rev 14103)
+++ freeswitch/trunk/libs/unimrcp/plugins/mrcp-flite/src/mrcp_flite.c 2009-07-02 00:54:48 UTC (rev 14104)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx">
</span><span class="cx"> typedef struct flite_synth_engine_t flite_synth_engine_t;
</span><span class="cx"> typedef struct flite_synth_channel_t flite_synth_channel_t;
</span><del>-typedef struct flite_synth_msg_t flite_synth_msg_t;
</del><span class="cx">
</span><span class="cx"> /** Declaration of synthesizer engine methods */
</span><span class="cx"> static apt_bool_t flite_synth_engine_destroy(mrcp_resource_engine_t *engine);
</span><span class="lines">@@ -58,6 +57,16 @@
</span><span class="cx"> static apt_bool_t flite_synth_channel_close(mrcp_engine_channel_t *channel);
</span><span class="cx"> static apt_bool_t flite_synth_channel_request_process(mrcp_engine_channel_t *channel, mrcp_message_t *request);
</span><span class="cx">
</span><ins>+static apt_bool_t flite_synth_channel_close_t(mrcp_engine_channel_t *channel); // wait for speak thread
+
+/** flite channel methods for processing MRCP channel request **/
+static apt_bool_t flite_synth_channel_speak(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response);
+static apt_bool_t flite_synth_channel_stop(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response);
+static apt_bool_t flite_synth_channel_pause(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response);
+static apt_bool_t flite_synth_channel_resume(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response);
+// static apt_bool_t flite_synth_channel_setparams(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response);
+// static apt_bool_t flite_synth_channel_getparams(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response);
+
</ins><span class="cx"> static const struct mrcp_engine_channel_method_vtable_t channel_vtable = {
</span><span class="cx"> flite_synth_channel_destroy,
</span><span class="cx"> flite_synth_channel_open,
</span><span class="lines">@@ -83,35 +92,26 @@
</span><span class="cx">
</span><span class="cx"> /** Declaration of flite synthesizer engine */
</span><span class="cx"> struct flite_synth_engine_t {
</span><del>- apt_consumer_task_t *task;
</del><span class="cx"> int iChannels;
</span><del>- apr_thread_mutex_t *guard;
</del><ins>+ struct {
+ cst_voice *awb;
+ cst_voice *kal;
+ cst_voice *rms;
+ cst_voice *slt;
+ } voices;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-// flite stuff
-APT_BEGIN_EXTERN_C
-
</del><ins>+/** declarations for flite voices **/
</ins><span class="cx"> cst_voice *register_cmu_us_awb(void);
</span><del>-void unregister_cmu_us_awb(cst_voice * v);
-
</del><span class="cx"> cst_voice *register_cmu_us_kal(void);
</span><del>-void unregister_cmu_us_kal(cst_voice * v);
-
</del><span class="cx"> cst_voice *register_cmu_us_rms(void);
</span><del>-void unregister_cmu_us_rms(cst_voice * v);
-
</del><span class="cx"> cst_voice *register_cmu_us_slt(void);
</span><ins>+void unregister_cmu_us_awb(cst_voice * v);
+void unregister_cmu_us_kal(cst_voice * v);
+void unregister_cmu_us_rms(cst_voice * v);
</ins><span class="cx"> void unregister_cmu_us_slt(cst_voice * v);
</span><span class="cx">
</span><del>-APT_END_EXTERN_C
</del><span class="cx">
</span><del>-static struct {
- cst_voice *awb;
- cst_voice *kal;
- cst_voice *rms;
- cst_voice *slt;
-} voices;
-
</del><span class="cx"> /** Declaration of flite synthesizer channel */
</span><span class="cx"> struct flite_synth_channel_t {
</span><span class="cx"> flite_synth_engine_t *flite_engine; // Back pointer to engine
</span><span class="lines">@@ -122,27 +122,12 @@
</span><span class="cx"> mpf_buffer_t *audio_buffer; // Audio buffer
</span><span class="cx"> int iId; // Synth channel simultaneous reference count
</span><span class="cx"> cst_voice *voice;
</span><del>- cst_wave *wave;
</del><span class="cx"> apr_pool_t *pool;
</span><span class="cx"> apt_consumer_task_t *task;
</span><ins>+ apr_thread_mutex_t *channel_guard;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-typedef enum flite_synth_msg_type_e {
- flite_synth_MSG_OPEN_CHANNEL,
- flite_synth_MSG_CLOSE_CHANNEL,
- flite_synth_MSG_REQUEST_PROCESS
-} flite_synth_msg_type_e;
-
</del><span class="cx"> /** Declaration of flite synthesizer task message */
</span><del>-struct flite_synth_msg_t {
- flite_synth_msg_type_e type;
- mrcp_engine_channel_t *channel;
- mrcp_message_t *request;
-};
-
-/* mutex: may be flite library is not thread safe*/
-static apr_thread_mutex_t *flite_mutex;
-
</del><span class="cx"> struct flite_speak_msg_t {
</span><span class="cx"> flite_synth_channel_t *channel;
</span><span class="cx"> mrcp_message_t *request;
</span><span class="lines">@@ -150,16 +135,9 @@
</span><span class="cx">
</span><span class="cx"> typedef struct flite_speak_msg_t flite_speak_msg_t;
</span><span class="cx">
</span><del>-// all calls to the Flite API functions (after initialization)
-// will be carried out using a separate task
-static apt_bool_t flite_synth_msg_signal(flite_synth_msg_type_e type, mrcp_engine_channel_t *channel, mrcp_message_t *request);
-static apt_bool_t flite_synth_msg_process(apt_task_t *task, apt_task_msg_t *msg);
-static apt_bool_t flite_synth_channel_open_t(mrcp_engine_channel_t * channel);
-static apt_bool_t flite_synth_channel_close_t(mrcp_engine_channel_t * channel);
-
-// and we have a special task for the actual synthesis -
</del><ins>+// we have a special task for the actual synthesis -
</ins><span class="cx"> // the task is created when a mrcp speak message is received
</span><del>-static apt_bool_t flite_speak_msg_process(apt_task_t *task, apt_task_msg_t *msg);
</del><ins>+static apt_bool_t flite_speak(apt_task_t *task, apt_task_msg_t *msg);
</ins><span class="cx">
</span><span class="cx"> /** Declare this macro to use log routine of the server where the plugin is loaded from */
</span><span class="cx"> MRCP_PLUGIN_LOGGER_IMPLEMENT
</span><span class="lines">@@ -169,44 +147,9 @@
</span><span class="cx"> {
</span><span class="cx"> /* create flite engine */
</span><span class="cx"> flite_synth_engine_t *flite_engine = (flite_synth_engine_t *) apr_palloc(pool,sizeof(flite_synth_engine_t));
</span><del>- apt_task_msg_pool_t *msg_pool;
- apt_task_vtable_t *task_vtable = 0;
-
</del><ins>+
</ins><span class="cx"> flite_engine->iChannels = 0;
</span><span class="cx">
</span><del>- /* create task/thread to run flite engine in the context of this task */
- msg_pool = apt_task_msg_pool_create_dynamic(sizeof(flite_synth_msg_t),pool);
- flite_engine->task = apt_consumer_task_create(flite_engine,msg_pool,pool);
- if (!flite_engine->task)
- {
- apt_log(APT_LOG_MARK, APT_PRIO_ERROR, "MRCP_PLUGIN_DECLARE cannot create task");
- return NULL;
- }
- task_vtable = apt_consumer_task_vtable_get(flite_engine->task);
- if (task_vtable)
- {
- task_vtable->process_msg = flite_synth_msg_process;
- }
- else
- {
- apt_log(APT_LOG_MARK, APT_PRIO_ERROR, "MRCP_PLUGIN_DECLARE cannot use task vtable");
- return NULL;
- }
-
- /* create flite mutex */
- if (apr_thread_mutex_create(&flite_mutex,APR_THREAD_MUTEX_DEFAULT,pool) != APR_SUCCESS)
- {
- apt_log(APT_LOG_MARK, APT_PRIO_ERROR,"Failed to create flite mutex");
- return NULL;
- }
-
- /* create channel mutex */
- if (apr_thread_mutex_create(&flite_engine->guard,APR_THREAD_MUTEX_DEFAULT,pool) != APR_SUCCESS)
- {
- apt_log(APT_LOG_MARK, APT_PRIO_ERROR, "Failed to create channel guard");
- return NULL;
- }
-
</del><span class="cx"> /* create resource engine base */
</span><span class="cx"> return mrcp_resource_engine_create(
</span><span class="cx"> MRCP_SYNTHESIZER_RESOURCE, /* MRCP resource identifier */
</span><span class="lines">@@ -218,17 +161,7 @@
</span><span class="cx"> /** Destroy synthesizer engine */
</span><span class="cx"> static apt_bool_t flite_synth_engine_destroy(mrcp_resource_engine_t *engine)
</span><span class="cx"> {
</span><del>- flite_synth_engine_t *flite_engine = (flite_synth_engine_t *) engine->obj;
-
- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "flite_synth_engine_destroy");
-
- if(flite_engine->task) {
- apt_task_t *task = apt_consumer_task_base_get(flite_engine->task);
- apt_task_destroy(task);
- flite_engine->task = NULL;
- }
-
- apr_thread_mutex_destroy(flite_engine->guard);
</del><ins>+ apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "flite_synth_engine_destroy");
</ins><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -236,19 +169,16 @@
</span><span class="cx"> static apt_bool_t flite_synth_engine_open(mrcp_resource_engine_t *engine)
</span><span class="cx"> {
</span><span class="cx"> flite_synth_engine_t *flite_engine = (flite_synth_engine_t *) engine->obj;
</span><del>- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "flite_synth_engine_open");
</del><ins>+ apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "flite_synth_engine_open");
</ins><span class="cx">
</span><span class="cx"> flite_init();
</span><del>- voices.awb = register_cmu_us_awb();
- voices.kal = register_cmu_us_kal();
- voices.rms = register_cmu_us_rms();
- voices.slt = register_cmu_us_slt();
- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "fliteInitialize success");
</del><ins>+ flite_engine->voices.awb = register_cmu_us_awb();
+ flite_engine->voices.kal = register_cmu_us_kal();
+ flite_engine->voices.rms = register_cmu_us_rms();
+ flite_engine->voices.slt = register_cmu_us_slt();
</ins><span class="cx">
</span><del>- if (flite_engine->task) {
- apt_task_t *task = apt_consumer_task_base_get(flite_engine->task);
- apt_task_start(task);
- }
</del><ins>+ apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "flite init success");
+
</ins><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -256,19 +186,13 @@
</span><span class="cx"> static apt_bool_t flite_synth_engine_close(mrcp_resource_engine_t *engine)
</span><span class="cx"> {
</span><span class="cx"> flite_synth_engine_t *flite_engine = (flite_synth_engine_t *) engine->obj;
</span><del>- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "flite_synth_engine_close");
</del><ins>+ apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "flite_synth_engine_close");
</ins><span class="cx">
</span><del>- if (flite_engine->task)
- {
- apt_task_t *task = apt_consumer_task_base_get(flite_engine->task);
- apt_task_terminate(task,TRUE);
- }
</del><ins>+ unregister_cmu_us_awb(flite_engine->voices.awb);
+ unregister_cmu_us_kal(flite_engine->voices.kal);
+ unregister_cmu_us_rms(flite_engine->voices.rms);
+ unregister_cmu_us_slt(flite_engine->voices.slt);
</ins><span class="cx">
</span><del>- unregister_cmu_us_awb(voices.awb);
- unregister_cmu_us_kal(voices.kal);
- unregister_cmu_us_rms(voices.rms);
- unregister_cmu_us_slt(voices.slt);
-
</del><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -279,24 +203,31 @@
</span><span class="cx"> flite_synth_channel_t *synth_channel = (flite_synth_channel_t *) apr_palloc(pool,sizeof(flite_synth_channel_t));
</span><span class="cx"> mpf_codec_descriptor_t *codec_descriptor = NULL;
</span><span class="cx">
</span><del>- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "flite_synth_engine_channel_create");
</del><ins>+ apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "flite_synth_engine_channel_create");
</ins><span class="cx">
</span><del>-// codec_descriptor = (mpf_codec_descriptor_t *) apr_palloc(pool,sizeof(mpf_codec_descriptor_t));
</del><ins>+// codec_descriptor = (mpf_codec_descriptor_t *) apr_palloc(pool,sizeof(mpf_codec_descriptor_t));
</ins><span class="cx"> // mpf_codec_descriptor_init(codec_descriptor);
</span><span class="cx"> // codec_descriptor->channel_count = 1;
</span><span class="cx"> // codec_descriptor->payload_type = 96;
</span><del>-// apt_string_set(&codec_descriptor->name,"L16");
</del><ins>+// apt_string_set(&codec_descriptor->name,"LPCM");
</ins><span class="cx"> // codec_descriptor->sampling_rate = 16000;
</span><del>-//
</del><ins>+
</ins><span class="cx"> synth_channel->flite_engine = (flite_synth_engine_t *) engine->obj;
</span><span class="cx"> synth_channel->speak_request = NULL; // no active speak request in progress
</span><span class="cx"> synth_channel->stop_response = NULL;
</span><span class="cx"> synth_channel->paused = FALSE;
</span><span class="cx"> synth_channel->pool = pool;
</span><del>- synth_channel->wave = NULL;
</del><ins>+ synth_channel->audio_buffer = NULL;
</ins><span class="cx"> synth_channel->voice = NULL;
</span><span class="cx"> synth_channel->iId = 0;
</span><span class="cx">
</span><ins>+ if (apr_thread_mutex_create(&synth_channel->channel_guard,APR_THREAD_MUTEX_DEFAULT,pool) != APR_SUCCESS)
+ {
+ apt_log(APT_LOG_MARK, APT_PRIO_ERROR, "Failed to create channel guard");
+ return NULL;
+ }
+
+
</ins><span class="cx"> /* create engine channel base */
</span><span class="cx"> synth_channel->channel = mrcp_engine_source_channel_create(
</span><span class="cx"> engine, /* resource engine */
</span><span class="lines">@@ -313,9 +244,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> synth_channel->audio_buffer = mpf_buffer_create(pool);
</span><del>- apr_thread_mutex_lock(synth_channel->flite_engine->guard);
</del><span class="cx"> synth_channel->iId = ++synth_channel->flite_engine->iChannels;
</span><del>- apr_thread_mutex_unlock(synth_channel->flite_engine->guard);
</del><span class="cx">
</span><span class="cx"> apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "flite_synth_engine_channel_create created channel %d", synth_channel->iId);
</span><span class="cx">
</span><span class="lines">@@ -326,25 +255,25 @@
</span><span class="cx"> static apt_bool_t flite_synth_channel_destroy(mrcp_engine_channel_t *channel)
</span><span class="cx"> {
</span><span class="cx"> flite_synth_channel_t *synth_channel = (flite_synth_channel_t *) channel->method_obj;
</span><del>- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "flite_synth_channel_destroy - channel %d", synth_channel->iId);
</del><ins>+ apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "flite_synth_channel_destroy - channel %d", synth_channel->iId);
</ins><span class="cx"> if(synth_channel->task)
</span><span class="cx"> {
</span><span class="cx"> apt_task_t *task = apt_consumer_task_base_get(synth_channel->task);
</span><del>- if (!apt_task_destroy(task))
</del><ins>+ if (!task || !apt_task_destroy(task))
</ins><span class="cx"> {
</span><span class="cx"> apt_log(APT_LOG_MARK, APT_PRIO_WARNING, "Speak task destroy failed - channel %d", synth_channel->iId);
</span><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><del>- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "Speak task destroyed - channel %d", synth_channel->iId);
</del><ins>+ apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "Speak task destroyed - channel %d", synth_channel->iId);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> synth_channel->task = NULL;
</span><del>-
- apr_thread_mutex_lock(synth_channel->flite_engine->guard);
</del><span class="cx"> synth_channel->flite_engine->iChannels--;
</span><del>- apr_thread_mutex_unlock(synth_channel->flite_engine->guard);
</del><span class="cx">
</span><ins>+ apr_thread_mutex_destroy(synth_channel->channel_guard);
+
</ins><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -352,40 +281,82 @@
</span><span class="cx"> static apt_bool_t flite_synth_channel_open(mrcp_engine_channel_t *channel)
</span><span class="cx"> {
</span><span class="cx"> flite_synth_channel_t *synth_channel = (flite_synth_channel_t *) channel->method_obj;
</span><del>- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "flite_synth_channel_open - channel %d", synth_channel->iId);
- return flite_synth_msg_signal(flite_synth_MSG_OPEN_CHANNEL,channel,NULL);
</del><ins>+ apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "flite_synth_channel_open - channel %d", synth_channel->iId);
+
+ synth_channel->voice = synth_channel->flite_engine->voices.awb;
+ return mrcp_engine_channel_open_respond(channel,TRUE);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** Close engine channel (asynchronous response MUST be sent)*/
</span><span class="cx"> static apt_bool_t flite_synth_channel_close(mrcp_engine_channel_t *channel)
</span><span class="cx"> {
</span><span class="cx"> flite_synth_channel_t *synth_channel = (flite_synth_channel_t *) channel->method_obj;
</span><del>- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "flite_synth_channel_close - channel %d", synth_channel->iId);
- return flite_synth_msg_signal(flite_synth_MSG_CLOSE_CHANNEL,channel,NULL);
</del><ins>+ apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "flite_synth_channel_close - channel %d", synth_channel->iId);
+ // create thread to wait for speak thread to terminate
+ flite_synth_channel_close_t(channel);
+ return TRUE;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** Process MRCP channel request (asynchronous response MUST be sent)*/
</span><span class="cx"> static apt_bool_t flite_synth_channel_request_process(mrcp_engine_channel_t *channel, mrcp_message_t *request)
</span><span class="cx"> {
</span><span class="cx"> flite_synth_channel_t *synth_channel = (flite_synth_channel_t *) channel->method_obj;
</span><del>- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "flite_synth_channel_request_process - channel %d", synth_channel->iId);
- return flite_synth_msg_signal(flite_synth_MSG_REQUEST_PROCESS,channel,request);
-}
</del><ins>+ mrcp_message_t *response = mrcp_response_create(request,request->pool);
+ apt_bool_t processed = FALSE;
</ins><span class="cx">
</span><del>-/** Open engine channel */
-static apt_bool_t flite_synth_channel_open_t(mrcp_engine_channel_t *channel)
-{
- flite_synth_channel_t *synth_channel = (flite_synth_channel_t *) channel->method_obj;
- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "flite_synth_channel_open_t - channel %d", synth_channel->iId);
</del><ins>+ apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "flite_synth_channel_request_process - channel %d", synth_channel->iId);
</ins><span class="cx">
</span><del>- synth_channel->voice = voices.awb;
</del><ins>+ switch(request->start_line.method_id) {
+ case SYNTHESIZER_SET_PARAMS:
+ // TODO set voices
+ // if (!strcasecmp(voice_name, "awb")) {
+ // synth_channel->voice = voices.awb;
+ // } else if (!strcasecmp(voice_name, "kal")) {
+ // synth_channel->voice = voices.kal;
+ // } else if (!strcasecmp(voice_name, "rms")) {
+ // synth_channel->voice = voices.rms;
+ // } else if (!strcasecmp(voice_name, "slt")) {
+ // synth_channel->voice = voices.slt;
+ // } else {
+ // apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "Valid voice names are awb, kal, rms or slt");
+ // }
+ break;
+ case SYNTHESIZER_GET_PARAMS:
+ break;
+ case SYNTHESIZER_SPEAK:
+ processed = flite_synth_channel_speak(channel,request,response);
+ break;
+ case SYNTHESIZER_STOP:
+ processed = flite_synth_channel_stop(channel,request,response);
+ break;
+ case SYNTHESIZER_PAUSE:
+ processed = flite_synth_channel_pause(channel,request,response);
+ break;
+ case SYNTHESIZER_RESUME:
+ processed = flite_synth_channel_resume(channel,request,response);
+ break;
+ case SYNTHESIZER_BARGE_IN_OCCURRED:
+ processed = flite_synth_channel_stop(channel,request,response);
+ break;
+ case SYNTHESIZER_CONTROL:
+ break;
+ case SYNTHESIZER_DEFINE_LEXICON:
+ break;
+ default:
+ break;
+ }
+ if(processed == FALSE) {
+ /* send asynchronous response for not handled request */
+ mrcp_engine_channel_message_send(channel,response);
+ }
</ins><span class="cx"> return TRUE;
</span><ins>+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static apt_bool_t flite_synth_channel_close_t(mrcp_engine_channel_t *channel)
</span><span class="cx"> {
</span><span class="cx"> flite_synth_channel_t *synth_channel = (flite_synth_channel_t *) channel->method_obj;
</span><del>- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "flite_synth_channel_close_t - channel %d", synth_channel->iId);
</del><ins>+ apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "flite_synth_channel_close_t - channel %d", synth_channel->iId);
</ins><span class="cx">
</span><span class="cx"> if (synth_channel->task)
</span><span class="cx"> {
</span><span class="lines">@@ -396,20 +367,12 @@
</span><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><del>- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "Speak task terminated - channel %d", synth_channel->iId);
</del><ins>+ apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "Speak task terminated - channel %d", synth_channel->iId);
</ins><span class="cx"> apt_task_destroy(task);
</span><span class="cx"> synth_channel->task = 0;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if (synth_channel->wave)
- {
- delete_wave(synth_channel->wave);
- synth_channel->wave = 0;
- }
- else
- {
- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "No wave buffer to delete - channel %d", synth_channel->iId);
- }
</del><ins>+ mrcp_engine_channel_close_respond(channel);
</ins><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -429,7 +392,7 @@
</span><span class="cx"> flite_speak_msg_t *flite_msg = 0;
</span><span class="cx">
</span><span class="cx"> /* create task/thread to run flite so this function is not blocking */
</span><del>- apt_log(APT_LOG_MARK,APT_PRIO_NOTICE,"Create flite speak task - channel: %d", synth_channel->iId);
</del><ins>+ apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "Create flite speak task - channel: %d", synth_channel->iId);
</ins><span class="cx"> synth_channel->task = apt_consumer_task_create(synth_channel, msg_pool, synth_channel->pool);
</span><span class="cx"> if (!synth_channel->task)
</span><span class="cx"> {
</span><span class="lines">@@ -444,10 +407,10 @@
</span><span class="cx"> return FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- task_vtable->process_msg = flite_speak_msg_process;
</del><ins>+ task_vtable->process_msg = flite_speak;
</ins><span class="cx"> synth_channel->speak_request = request;
</span><span class="cx">
</span><del>- apt_log(APT_LOG_MARK,APT_PRIO_INFO, "Start task - channel %d", synth_channel->iId);
</del><ins>+ apt_log(APT_LOG_MARK,APT_PRIO_DEBUG, "Start task - channel %d", synth_channel->iId);
</ins><span class="cx"> task = apt_consumer_task_base_get(synth_channel->task);
</span><span class="cx"> if (apt_task_start(task) == FALSE)
</span><span class="cx"> {
</span><span class="lines">@@ -461,7 +424,7 @@
</span><span class="cx"> flite_msg = (flite_speak_msg_t*) msg->data;
</span><span class="cx"> flite_msg->channel = synth_channel;
</span><span class="cx"> flite_msg->request = request;
</span><del>- apt_log(APT_LOG_MARK,APT_PRIO_INFO, "Send signal to start speech synthesis - channel:%d", synth_channel->iId);
</del><ins>+ apt_log(APT_LOG_MARK,APT_PRIO_DEBUG, "Send signal to start speech synthesis - channel:%d", synth_channel->iId);
</ins><span class="cx"> if (apt_task_msg_signal(task,msg))
</span><span class="cx"> {
</span><span class="cx"> response->start_line.request_state = MRCP_REQUEST_STATE_INPROGRESS;
</span><span class="lines">@@ -469,7 +432,7 @@
</span><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><del>- apt_log(APT_LOG_MARK,APT_PRIO_INFO, "Failed to send signal to start speech synthesis - channel:%d", synth_channel->iId);
</del><ins>+ apt_log(APT_LOG_MARK,APT_PRIO_WARNING, "Failed to send signal to start speech synthesis - channel:%d", synth_channel->iId);
</ins><span class="cx"> apt_task_destroy(task);
</span><span class="cx"> return FALSE;
</span><span class="cx"> }
</span><span class="lines">@@ -477,37 +440,65 @@
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static apt_bool_t flite_speak_msg_process(apt_task_t *task, apt_task_msg_t *msg)
</del><ins>+static apt_bool_t flite_speak(apt_task_t *task, apt_task_msg_t *msg)
</ins><span class="cx"> {
</span><span class="cx"> flite_speak_msg_t *flite_msg = (flite_speak_msg_t*)msg->data;
</span><span class="cx"> flite_synth_channel_t *synth_channel = (flite_synth_channel_t *) flite_msg->channel;
</span><span class="cx"> apr_time_t start = 0;
</span><span class="cx"> apr_time_t elapsed = 0;
</span><del>- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "< flite_speak_msg_process speak - channel %d", synth_channel->iId);
-
- // probably not necessary !?
- mpf_buffer_restart(synth_channel->audio_buffer);
</del><ins>+ apr_time_t stamp = 0;
</ins><span class="cx">
</span><ins>+ mrcp_message_t *stop_response = 0;
+ mpf_codec_t * codec = mrcp_engine_source_stream_codec_get(synth_channel->channel);
+ apr_uint16_t rate = codec->descriptor->sampling_rate;
+
+ apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "< flite_speak_msg_process speak - channel %d", synth_channel->iId);
+
</ins><span class="cx"> // just sequential stuff
</span><span class="cx"> start = apr_time_now(); // in microsec
</span><span class="cx"> if (synth_channel->speak_request->body.length)
</span><span class="cx"> {
</span><del>- cst_wave * wave = synth_channel->wave;
</del><ins>+ // TODO
+ // create small units of text from synth_channel->speak_request->body.buf ( , . ? ! but ...
+ // synthesize small unit and store in audio_buffer
+ // check for stop
+ // pause resume state could improve performance
+ // you can "pause" generating new speech from a unit of text
+ // by checking the (decreasing) size of the audio_buffer
+ // no need to generate more speech samples than can be listened to...
+ cst_wave *wave = 0;
</ins><span class="cx"> wave = flite_text_to_wave(synth_channel->speak_request->body.buf, synth_channel->voice);
</span><ins>+ if (wave && cst_wave_num_samples(wave))
+ {
+ int generated = (cst_wave_num_samples(wave)/cst_wave_sample_rate(wave)*1000);
+ stamp = apr_time_now();
+ elapsed = (stamp - start)/1000;
+ apt_log(APT_LOG_MARK, APT_PRIO_INFO, "TTS (chan %d) took %"APR_TIME_T_FMT" to generate %d of speech (in millisec)", synth_channel->iId, elapsed, generated);
+
+ if (rate != 16000)
+ {
+ cst_wave_resample(wave, rate);
+ elapsed = (apr_time_now() - stamp)/1000;
+ apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "TTS resampling to %d on (chan %d) took %"APR_TIME_T_FMT" millisec", rate, synth_channel->iId, elapsed);
+ }
+ mpf_buffer_audio_write(synth_channel->audio_buffer, cst_wave_samples(wave), cst_wave_num_samples(wave) * 2);
+ delete_wave(wave);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- elapsed = (apr_time_now() - start)/1000;
- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "TTS (chan %d) took %ld millisec", synth_channel->iId, elapsed);
</del><ins>+ apr_thread_mutex_lock(synth_channel->channel_guard);
+ stop_response = synth_channel->stop_response;
+ apr_thread_mutex_unlock(synth_channel->channel_guard);
</ins><span class="cx">
</span><del>- if (!synth_channel->stop_response)
</del><ins>+ if (!stop_response)
</ins><span class="cx"> {
</span><span class="cx"> // this will notify the callback that feeds the client that synthesis is complete
</span><span class="cx"> mpf_buffer_event_write(synth_channel->audio_buffer, MEDIA_FRAME_TYPE_EVENT);
</span><del>- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "> flite_speak_msg_process speak - end of TTS - %d", synth_channel->iId);
</del><ins>+ apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "> flite_speak_msg_process speak - end of TTS - %d", synth_channel->iId);
</ins><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><del>- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "> flite_speak_msg_process speak - channel %d", synth_channel->iId);
</del><ins>+ apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "> flite_speak_msg_process speak - channel %d", synth_channel->iId);
</ins><span class="cx"> }
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="lines">@@ -516,11 +507,13 @@
</span><span class="cx"> static apt_bool_t flite_synth_channel_stop(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response)
</span><span class="cx"> {
</span><span class="cx"> flite_synth_channel_t *synth_channel = (flite_synth_channel_t *) channel->method_obj;
</span><del>- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "flite_synth_channel_stop - channel %d", synth_channel->iId);
</del><ins>+ apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "flite_synth_channel_stop - channel %d", synth_channel->iId);
</ins><span class="cx"> /* store the request, make sure there is no more activity and only then send the response */
</span><span class="cx">
</span><del>- /* TODO this should probably be mutexed */
</del><ins>+ apr_thread_mutex_lock(synth_channel->channel_guard);
</ins><span class="cx"> synth_channel->stop_response = response;
</span><ins>+ apr_thread_mutex_unlock(synth_channel->channel_guard);
+
</ins><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -528,7 +521,7 @@
</span><span class="cx"> static apt_bool_t flite_synth_channel_pause(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response)
</span><span class="cx"> {
</span><span class="cx"> flite_synth_channel_t *synth_channel = (flite_synth_channel_t *) channel->method_obj;
</span><del>- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "flite_synth_channel_pause - channel %d", synth_channel->iId);
</del><ins>+ apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "flite_synth_channel_pause - channel %d", synth_channel->iId);
</ins><span class="cx">
</span><span class="cx"> synth_channel->paused = TRUE;
</span><span class="cx"> /* send asynchronous response */
</span><span class="lines">@@ -540,7 +533,7 @@
</span><span class="cx"> static apt_bool_t flite_synth_channel_resume(mrcp_engine_channel_t *channel, mrcp_message_t *request, mrcp_message_t *response)
</span><span class="cx"> {
</span><span class="cx"> flite_synth_channel_t *synth_channel = (flite_synth_channel_t *) channel->method_obj;
</span><del>- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "flite_synth_channel_resume - channel %d", synth_channel->iId);
</del><ins>+ apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "flite_synth_channel_resume - channel %d", synth_channel->iId);
</ins><span class="cx">
</span><span class="cx"> synth_channel->paused = FALSE;
</span><span class="cx"> /* send asynchronous response */
</span><span class="lines">@@ -548,61 +541,6 @@
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/** Dispatch MRCP request */
-static apt_bool_t flite_synth_channel_request_dispatch(mrcp_engine_channel_t *channel, mrcp_message_t *request)
-{
- flite_synth_channel_t *synth_channel = (flite_synth_channel_t *) channel->method_obj;
- apt_bool_t processed = FALSE;
- mrcp_message_t *response = mrcp_response_create(request,request->pool);
-
- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "flite_synth_channel_request_dispatch - channel %d", synth_channel->iId);
-
- switch(request->start_line.method_id) {
- case SYNTHESIZER_SET_PARAMS:
- // TODO set voices
- // if (!strcasecmp(voice_name, "awb")) {
- // synth_channel->voice = voices.awb;
- // } else if (!strcasecmp(voice_name, "kal")) {
- // synth_channel->voice = voices.awb;
- // } else if (!strcasecmp(voice_name, "rms")) {
- // synth_channel->voice = voices.awb;
- // } else if (!strcasecmp(voice_name, "slt")) {
- // synth_channel->voice = voices.awb;
- // } else {
- // apt_log(APT_LOG_MARK, APT_PRIO_INFO, "Valid voice names are awb, kal, rms or slt");
- // }
- break;
- case SYNTHESIZER_GET_PARAMS:
- break;
- case SYNTHESIZER_SPEAK:
- processed = flite_synth_channel_speak(channel,request,response);
- break;
- case SYNTHESIZER_STOP:
- processed = flite_synth_channel_stop(channel,request,response);
- break;
- case SYNTHESIZER_PAUSE:
- processed = flite_synth_channel_pause(channel,request,response);
- break;
- case SYNTHESIZER_RESUME:
- processed = flite_synth_channel_resume(channel,request,response);
- break;
- case SYNTHESIZER_BARGE_IN_OCCURRED:
- processed = flite_synth_channel_stop(channel,request,response);
- break;
- case SYNTHESIZER_CONTROL:
- break;
- case SYNTHESIZER_DEFINE_LEXICON:
- break;
- default:
- break;
- }
- if(processed == FALSE) {
- /* send asynchronous response for not handled request */
- mrcp_engine_channel_message_send(channel,response);
- }
- return TRUE;
-}
-
</del><span class="cx"> /** Callback is called from MPF engine context to destroy any additional data associated with audio stream */
</span><span class="cx"> static apt_bool_t flite_synth_stream_destroy(mpf_audio_stream_t *stream)
</span><span class="cx"> {
</span><span class="lines">@@ -613,16 +551,16 @@
</span><span class="cx"> /** Callback is called from MPF engine context to perform any action before open */
</span><span class="cx"> static apt_bool_t flite_synth_stream_open(mpf_audio_stream_t *stream)
</span><span class="cx"> {
</span><del>- flite_synth_channel_t *synth_channel = (flite_synth_channel_t *) stream->obj;
- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "flite_synth_stream_open - channel %d", synth_channel->iId);
</del><ins>+// flite_synth_channel_t *synth_channel = (flite_synth_channel_t *) stream->obj;
+// apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "flite_synth_stream_open - channel %d", synth_channel->iId);
</ins><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** Callback is called from MPF engine context to perform any action after close */
</span><span class="cx"> static apt_bool_t flite_synth_stream_close(mpf_audio_stream_t *stream)
</span><span class="cx"> {
</span><del>- flite_synth_channel_t *synth_channel = (flite_synth_channel_t *) stream->obj;
- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "flite_synth_stream_close - channel %d", synth_channel->iId);
</del><ins>+// flite_synth_channel_t *synth_channel = (flite_synth_channel_t *) stream->obj;
+// apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "flite_synth_stream_close - channel %d", synth_channel->iId);
</ins><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -631,7 +569,7 @@
</span><span class="cx"> {
</span><span class="cx"> mrcp_message_t *message = 0;
</span><span class="cx"> mrcp_synth_header_t * synth_header = 0;
</span><del>- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "flite_synth_speak_complete_raise - channel %d", synth_channel->iId);
</del><ins>+ apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "flite_synth_speak_complete_raise - channel %d", synth_channel->iId);
</ins><span class="cx">
</span><span class="cx"> if (!synth_channel->speak_request) {
</span><span class="cx"> return FALSE;
</span><span class="lines">@@ -664,7 +602,6 @@
</span><span class="cx"> static apt_bool_t flite_synth_stream_read(mpf_audio_stream_t *stream, mpf_frame_t *frame)
</span><span class="cx"> {
</span><span class="cx"> flite_synth_channel_t *synth_channel = (flite_synth_channel_t *) stream->obj;
</span><del>- cst_wave * wave = synth_channel->wave;
</del><span class="cx"> if (synth_channel->stop_response && synth_channel->speak_request)
</span><span class="cx"> {
</span><span class="cx"> /* send asynchronous response to STOP request */
</span><span class="lines">@@ -674,17 +611,12 @@
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (wave && cst_wave_num_samples(wave))
- {
- mpf_buffer_audio_write(synth_channel->audio_buffer, cst_wave_samples(wave), cst_wave_num_samples(wave) * 2);
- }
-
</del><span class="cx"> /* check if there is active SPEAK request and it isn't in paused state */
</span><span class="cx"> if (synth_channel->speak_request && synth_channel->paused == FALSE)
</span><span class="cx"> {
</span><span class="cx"> /* normal processing */
</span><span class="cx"> mpf_buffer_frame_read(synth_channel->audio_buffer,frame);
</span><del>-// apt_log(APT_LOG_MARK, APT_PRIO_INFO, "flite_synth_stream_read - channel %d - size %d", synth_channel->iId, mpf_buffer_get_size(synth_channel->audio_buffer));
</del><ins>+// apt_log(APT_LOG_MARK, APT_PRIO_DEBUG, "flite_synth_stream_read - channel %d - size %d", synth_channel->iId, mpf_buffer_get_size(synth_channel->audio_buffer));
</ins><span class="cx">
</span><span class="cx"> if((frame->type & MEDIA_FRAME_TYPE_EVENT) == MEDIA_FRAME_TYPE_EVENT)
</span><span class="cx"> {
</span><span class="lines">@@ -692,58 +624,4 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return TRUE;
</span><del>-}
-
-static apt_bool_t flite_synth_msg_signal(flite_synth_msg_type_e type, mrcp_engine_channel_t *channel, mrcp_message_t *request)
-{
- flite_synth_channel_t *synth_channel = (flite_synth_channel_t *) channel->method_obj;
- apt_bool_t status = FALSE;
- flite_synth_engine_t *flite_engine = synth_channel->flite_engine;
- apt_task_t *task = apt_consumer_task_base_get(flite_engine->task);
- apt_task_msg_t *msg = apt_task_msg_get(task);
-
- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "flite_synth_msg_signal - channel %d", synth_channel->iId);
-
- if (msg) {
- flite_synth_msg_t *flite_msg;
- msg->type = TASK_MSG_USER;
- flite_msg = (flite_synth_msg_t*) msg->data;
-
- flite_msg->type = type;
- flite_msg->channel = channel;
- flite_msg->request = request;
- status = apt_task_msg_signal(task,msg);
- }
- else
- {
- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "flite_synth_msg_signal - task msg not found %d", synth_channel->iId);
- }
- return status;
-}
-
-static apt_bool_t flite_synth_msg_process(apt_task_t *task, apt_task_msg_t *msg)
-{
- flite_synth_msg_t *flite_msg = (flite_synth_msg_t*)msg->data;
- flite_synth_channel_t *synth_channel = (flite_synth_channel_t *) flite_msg->channel->method_obj;
-
- apt_log(APT_LOG_MARK, APT_PRIO_INFO, "flite_synth_msg_process - channel %d", synth_channel->iId);
-
- switch(flite_msg->type) {
- case flite_synth_MSG_OPEN_CHANNEL:
- /* open channel and send asynch response */
- flite_synth_channel_open_t(flite_msg->channel);
- mrcp_engine_channel_open_respond(flite_msg->channel,TRUE);
- break;
- case flite_synth_MSG_CLOSE_CHANNEL:
- /* close channel, make sure there is no activity and send asynch response */
- flite_synth_channel_close_t(flite_msg->channel);
- mrcp_engine_channel_close_respond(flite_msg->channel);
- break;
- case flite_synth_MSG_REQUEST_PROCESS:
- flite_synth_channel_request_dispatch(flite_msg->channel,flite_msg->request);
- break;
- default:
- break;
- }
- return TRUE;
-}
</del><ins>+}
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="freeswitchtrunklibsunimrcppluginsmrcppocketsphinxMakefileam"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/Makefile.am (14103 => 14104)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/Makefile.am 2009-07-02 00:24:29 UTC (rev 14103)
+++ freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/Makefile.am 2009-07-02 00:54:48 UTC (rev 14104)
</span><span class="lines">@@ -15,6 +15,15 @@
</span><span class="cx">
</span><span class="cx"> plugin_LTLIBRARIES = mrcppocketsphinx.la
</span><span class="cx">
</span><del>-mrcppocketsphinx_la_SOURCES = src/mrcp_pocketsphinx.c
</del><ins>+mrcppocketsphinx_la_SOURCES = src/mrcp_pocketsphinx.c \
+ src/pocketsphinx_properties.c
</ins><span class="cx"> mrcppocketsphinx_la_LDFLAGS = -module $(PLUGIN_LT_VERSION)
</span><span class="cx"> mrcppocketsphinx_la_LIBADD = $(UNIMRCP_POCKETSPHINX_LIBS) $(UNIMRCP_SPHINXBASE_LIBS) -lm
</span><ins>+
+
+install-data-local:
+ test -d $(confdir) || $(mkinstalldirs) $(confdir)
+ test -f $(confdir)/pocketsphinx.xml || $(INSTALL) -m 644 conf/pocketsphinx.xml $(confdir)
+ test -d $(datadir)/wsj1 || $(mkinstalldirs) $(datadir)/wsj1; \
+ $(INSTALL) -m 644 $(UNIMRCP_POCKETSPHINX_MODELS)/hmm/wsj1/* $(datadir)/wsj1; \
+ $(INSTALL) -m 644 $(UNIMRCP_POCKETSPHINX_MODELS)/lm/cmudict.0.6d $(datadir)/default.dic
</ins></span></pre></div>
<a id="freeswitchtrunklibsunimrcppluginsmrcppocketsphinxconfpocketsphinxxml"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/conf/pocketsphinx.xml (0 => 14104)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/conf/pocketsphinx.xml (rev 0)
+++ freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/conf/pocketsphinx.xml 2009-07-02 00:54:48 UTC (rev 14104)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!-- PocketSphinx Document -->
+<pocketsphinx>
+ <!-- Senstitivity level and timeout are used for voice activity (speech) detection
+ reasonable values: level is in [2..250] range, timeout is in [100..500] msec range
+ -->
+ <sensitivity level="50" timeout="300"/>
+
+ <!-- Default values for noinput and recognition timeout,
+ these values can be overriden by client's requests
+ -->
+ <timers noinput-timeout="10000" recognition-timeout="15000"/>
+
+
+ <!-- PocketSphinx related model and dictionary data.
+ Default dir (dir="") is InstallDir/data
+ -->
+ <model dir="" narrowband="communicator" wideband="wsj1" dictionary="default.dic" preferred="narrowband"/>
+ <!-- <model dir="/usr/local/freeswitch/grammar" narrowband="model/communicator" wideband="model/wsj1" dictionary="default.dic"/> -->
+
+ <!-- Enable to save utterance.
+ Default dir (dir="") is InstallDir/data
+ -->
+ <save-waveform dir="" enable="0"/>
+</pocketsphinx>
</ins></span></pre></div>
<a id="freeswitchtrunklibsunimrcppluginsmrcppocketsphinxincludepocketsphinx_propertiesh"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/include/pocketsphinx_properties.h (0 => 14104)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/include/pocketsphinx_properties.h (rev 0)
+++ freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/include/pocketsphinx_properties.h 2009-07-02 00:54:48 UTC (rev 14104)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __POCKETSPHINX_PROPERTIES_H__
+#define __POCKETSPHINX_PROPERTIES_H__
+
+/**
+ * @file pocketsphinx_properties.h
+ * @brief PocketSphinx Properties
+ */
+
+#include "apt_dir_layout.h"
+
+APT_BEGIN_EXTERN_C
+
+typedef enum {
+ POCKETSPHINX_MODEL_NARROWBAND,
+ POCKETSPHINX_MODEL_WIDEBAND
+
+} pocketsphinx_model_e;
+
+/** Declaration of pocketsphinx properties */
+typedef struct pocketsphinx_properties_t pocketsphinx_properties_t;
+
+/** Pocketsphinx properties */
+struct pocketsphinx_properties_t {
+ const char *data_dir;
+ const char *dictionary;
+ const char *model_8k;
+ const char *model_16k;
+ pocketsphinx_model_e preferred_model;
+
+ apr_size_t sensitivity_level;
+ apr_size_t sensitivity_timeout;
+
+ apr_size_t no_input_timeout;
+ apr_size_t recognition_timeout;
+ apr_size_t partial_result_timeout;
+
+ apt_bool_t save_waveform;
+ const char *save_waveform_dir;
+};
+
+apt_bool_t pocketsphinx_properties_load(pocketsphinx_properties_t *properties,
+ const char *file_path,
+ const apt_dir_layout_t *dir_layout,
+ apr_pool_t *pool);
+
+APT_END_EXTERN_C
+
+#endif /*__POCKETSPHINX_PROPERTIES_H__*/
</ins></span></pre></div>
<a id="freeswitchtrunklibsunimrcppluginsmrcppocketsphinxmrcppocketsphinxvcproj"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/mrcppocketsphinx.vcproj (14103 => 14104)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/mrcppocketsphinx.vcproj 2009-07-02 00:24:29 UTC (rev 14103)
+++ freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/mrcppocketsphinx.vcproj 2009-07-02 00:54:48 UTC (rev 14104)
</span><span class="lines">@@ -149,6 +149,10 @@
</span><span class="cx"> Filter="h;hpp;hxx;hm;inl;inc;xsd"
</span><span class="cx"> UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
</span><span class="cx"> >
</span><ins>+ <File
+ RelativePath=".\include\pocketsphinx_properties.h"
+ >
+ </File>
</ins><span class="cx"> </Filter>
</span><span class="cx"> <Filter
</span><span class="cx"> Name="src"
</span><span class="lines">@@ -158,6 +162,10 @@
</span><span class="cx"> RelativePath=".\src\mrcp_pocketsphinx.c"
</span><span class="cx"> >
</span><span class="cx"> </File>
</span><ins>+ <File
+ RelativePath=".\src\pocketsphinx_properties.c"
+ >
+ </File>
</ins><span class="cx"> </Filter>
</span><span class="cx"> </Files>
</span><span class="cx"> <Globals>
</span></span></pre></div>
<a id="freeswitchtrunklibsunimrcppluginsmrcppocketsphinxsrcmrcp_pocketsphinxc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/src/mrcp_pocketsphinx.c (14103 => 14104)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/src/mrcp_pocketsphinx.c 2009-07-02 00:24:29 UTC (rev 14103)
+++ freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/src/mrcp_pocketsphinx.c 2009-07-02 00:54:48 UTC (rev 14104)
</span><span class="lines">@@ -35,14 +35,15 @@
</span><span class="cx"> #include "mrcp_generic_header.h"
</span><span class="cx"> #include "mrcp_message.h"
</span><span class="cx"> #include "mpf_activity_detector.h"
</span><ins>+#include "pocketsphinx_properties.h"
</ins><span class="cx"> #include "apt_log.h"
</span><span class="cx">
</span><ins>+#define POCKETSPHINX_CONFFILE_NAME "pocketsphinx.xml"
</ins><span class="cx">
</span><span class="cx"> #define RECOGNIZER_SIDRES(recognizer) (recognizer)->channel->id.buf, "pocketsphinx"
</span><span class="cx">
</span><span class="cx"> typedef struct pocketsphinx_engine_t pocketsphinx_engine_t;
</span><span class="cx"> typedef struct pocketsphinx_recognizer_t pocketsphinx_recognizer_t;
</span><del>-typedef struct pocketsphinx_properties_t pocketsphinx_properties_t;
</del><span class="cx">
</span><span class="cx"> /** Methods of recognition engine */
</span><span class="cx"> static apt_bool_t pocketsphinx_engine_destroy(mrcp_resource_engine_t *engine);
</span><span class="lines">@@ -86,23 +87,14 @@
</span><span class="cx">
</span><span class="cx"> /** Pocketsphinx engine (engine is an aggregation of recognizers) */
</span><span class="cx"> struct pocketsphinx_engine_t {
</span><del>- mrcp_resource_engine_t *base;
</del><ins>+ /* Resource engine base */
+ mrcp_resource_engine_t *base;
+ /** Properties loaded from config file */
+ pocketsphinx_properties_t properties;
</ins><span class="cx"> };
</span><span class="cx">
</span><del>-/** Pocketsphinx properties */
-struct pocketsphinx_properties_t {
- const char *dictionary;
- const char *model_8k;
- const char *model_16k;
- apr_size_t noinput_timeout;
- apr_size_t recognition_timeout;
- apr_size_t partial_result_timeout;
-};
-
</del><span class="cx"> /** Pocketsphinx channel (recognizer) */
</span><span class="cx"> struct pocketsphinx_recognizer_t {
</span><del>- /** Back pointer to engine */
- pocketsphinx_engine_t *engine;
</del><span class="cx"> /** Engine channel base */
</span><span class="cx"> mrcp_engine_channel_t *channel;
</span><span class="cx">
</span><span class="lines">@@ -110,12 +102,12 @@
</span><span class="cx"> ps_decoder_t *decoder;
</span><span class="cx"> /** Configuration */
</span><span class="cx"> cmd_ln_t *config;
</span><del>- /** Properties (to be loaded from config file) */
</del><ins>+ /** Recognizer properties coppied from defualt engine properties */
</ins><span class="cx"> pocketsphinx_properties_t properties;
</span><span class="cx"> /** Is input timer started */
</span><span class="cx"> apt_bool_t is_input_timer_on;
</span><span class="cx"> /** Noinput timeout */
</span><del>- apr_size_t noinput_timeout;
</del><ins>+ apr_size_t no_input_timeout;
</ins><span class="cx"> /** Recognition timeout */
</span><span class="cx"> apr_size_t recognition_timeout;
</span><span class="cx"> /** Timeout elapsed since the last partial result checking */
</span><span class="lines">@@ -126,6 +118,8 @@
</span><span class="cx"> const char *grammar_id;
</span><span class="cx"> /** Table of defined grammars (key=content-id, value=grammar-file-path) */
</span><span class="cx"> apr_table_t *grammar_table;
</span><ins>+ /** File to write waveform to if save_waveform is on */
+ apr_file_t *waveform;
</ins><span class="cx">
</span><span class="cx"> /** Voice activity detector */
</span><span class="cx"> mpf_activity_detector_t *detector;
</span><span class="lines">@@ -170,33 +164,42 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** Destroy pocketsphinx engine */
</span><del>-static apt_bool_t pocketsphinx_engine_destroy(mrcp_resource_engine_t *engine)
</del><ins>+static apt_bool_t pocketsphinx_engine_destroy(mrcp_resource_engine_t *resource_engine)
</ins><span class="cx"> {
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** Open pocketsphinx engine */
</span><del>-static apt_bool_t pocketsphinx_engine_open(mrcp_resource_engine_t *engine)
</del><ins>+static apt_bool_t pocketsphinx_engine_open(mrcp_resource_engine_t *resource_engine)
</ins><span class="cx"> {
</span><ins>+ pocketsphinx_engine_t *engine = resource_engine->obj;
+ const apt_dir_layout_t *dir_layout = resource_engine->dir_layout;
+
+ char *file_path = NULL;
+ apr_filepath_merge(&file_path,dir_layout->conf_dir_path,POCKETSPHINX_CONFFILE_NAME,0,resource_engine->pool);
+
+ /* load properties */
+ pocketsphinx_properties_load(&engine->properties,file_path,dir_layout,resource_engine->pool);
</ins><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** Close pocketsphinx engine */
</span><del>-static apt_bool_t pocketsphinx_engine_close(mrcp_resource_engine_t *engine)
</del><ins>+static apt_bool_t pocketsphinx_engine_close(mrcp_resource_engine_t *resource_engine)
</ins><span class="cx"> {
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /** Create pocketsphinx recognizer */
</span><del>-static mrcp_engine_channel_t* pocketsphinx_engine_recognizer_create(mrcp_resource_engine_t *engine, apr_pool_t *pool)
</del><ins>+static mrcp_engine_channel_t* pocketsphinx_engine_recognizer_create(mrcp_resource_engine_t *resource_engine, apr_pool_t *pool)
</ins><span class="cx"> {
</span><span class="cx"> mrcp_engine_channel_t *channel;
</span><ins>+ mpf_codec_descriptor_t *codec_descriptor;
+ pocketsphinx_engine_t *engine = resource_engine->obj;
</ins><span class="cx"> pocketsphinx_recognizer_t *recognizer = apr_palloc(pool,sizeof(pocketsphinx_recognizer_t));
</span><del>-// recognizer->engine = engine;
</del><span class="cx"> recognizer->decoder = NULL;
</span><span class="cx"> recognizer->config = NULL;
</span><span class="cx"> recognizer->is_input_timer_on = FALSE;
</span><del>- recognizer->noinput_timeout = 0;
</del><ins>+ recognizer->no_input_timeout = 0;
</ins><span class="cx"> recognizer->recognition_timeout = 0;
</span><span class="cx"> recognizer->partial_result_timeout = 0;
</span><span class="cx"> recognizer->last_result = NULL;
</span><span class="lines">@@ -211,10 +214,24 @@
</span><span class="cx"> recognizer->close_requested = FALSE;
</span><span class="cx"> recognizer->grammar_id = NULL;
</span><span class="cx"> recognizer->grammar_table = apr_table_make(pool,1);
</span><del>-
</del><ins>+ recognizer->waveform = NULL;
+
+ /* copy default properties loaded from config */
+ recognizer->properties = engine->properties;
+
+ codec_descriptor = (mpf_codec_descriptor_t *) apr_palloc(pool,sizeof(mpf_codec_descriptor_t));
+ mpf_codec_descriptor_init(codec_descriptor);
+ codec_descriptor->channel_count = 1;
+ codec_descriptor->payload_type = 96;
+ apt_string_set(&codec_descriptor->name,"LPCM");
+ codec_descriptor->sampling_rate = 8000;
+ if(recognizer->properties.preferred_model == POCKETSPHINX_MODEL_WIDEBAND) {
+ codec_descriptor->sampling_rate = 16000;
+ }
+
</ins><span class="cx"> /* create engine channel base */
</span><span class="cx"> channel = mrcp_engine_sink_channel_create(
</span><del>- engine, /* resource engine */
</del><ins>+ resource_engine, /* resource engine */
</ins><span class="cx"> &channel_vtable, /* virtual methods table of engine channel */
</span><span class="cx"> &audio_stream_vtable, /* virtual methods table of audio stream */
</span><span class="cx"> recognizer, /* object to associate */
</span><span class="lines">@@ -295,33 +312,23 @@
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
-
-/** Load pocketsphinx properties [RECOG] */
-static apt_bool_t pocketsphinx_properties_load(pocketsphinx_recognizer_t *recognizer)
-{
- mrcp_engine_channel_t *channel = recognizer->channel;
- const apt_dir_layout_t *dir_layout = channel->engine->dir_layout;
- pocketsphinx_properties_t *properties = &recognizer->properties;
-
- properties->dictionary = apt_datadir_filepath_get(dir_layout,"pocketsphinx/default.dic",channel->pool);
- properties->model_8k = apt_datadir_filepath_get(dir_layout,"pocketsphinx/communicator",channel->pool);
- properties->model_16k = apt_datadir_filepath_get(dir_layout,"pocketsphinx/wsj1",channel->pool);
-
- properties->noinput_timeout = 5000;
- properties->recognition_timeout = 15000;
- properties->partial_result_timeout = 100;
-
- return TRUE;
-}
-
</del><span class="cx"> /** Initialize pocketsphinx decoder [RECOG] */
</span><span class="cx"> static apt_bool_t pocketsphinx_decoder_init(pocketsphinx_recognizer_t *recognizer, const char *grammar)
</span><span class="cx"> {
</span><del>- apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Init Config "APT_SIDRES_FMT,RECOGNIZER_SIDRES(recognizer));
</del><ins>+ const char *model = recognizer->properties.model_8k;
+ const char *rate = "8000";
+ if(recognizer->properties.preferred_model == POCKETSPHINX_MODEL_WIDEBAND) {
+ model = recognizer->properties.model_16k;
+ rate = "16000";
+ }
+
+ apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Init Config rate [%s] dictionary [%s] "APT_SIDRES_FMT,
+ rate,
+ recognizer->properties.dictionary,
+ RECOGNIZER_SIDRES(recognizer));
</ins><span class="cx"> recognizer->config = cmd_ln_init(recognizer->config, ps_args(), FALSE,
</span><del>- "-samprate", "8000",
- "-hmm", recognizer->properties.model_8k,
</del><ins>+ "-samprate", rate,
+ "-hmm", model,
</ins><span class="cx"> "-jsgf", grammar,
</span><span class="cx"> "-dict", recognizer->properties.dictionary,
</span><span class="cx"> "-frate", "50",
</span><span class="lines">@@ -469,7 +476,7 @@
</span><span class="cx"> return FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- grammar_file_name = apr_psprintf(channel->pool,"pocketsphinx/%s-%s.gram",channel->id.buf,content_id);
</del><ins>+ grammar_file_name = apr_psprintf(channel->pool,"%s-%s.gram",channel->id.buf,content_id);
</ins><span class="cx"> grammar_file_path = apt_datadir_filepath_get(dir_layout,grammar_file_name,channel->pool);
</span><span class="cx">
</span><span class="cx"> apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Create Grammar File [%s] "APT_SIDRES_FMT,
</span><span class="lines">@@ -519,6 +526,7 @@
</span><span class="cx"> /** Process RECOGNIZE request [RECOG] */
</span><span class="cx"> static apt_bool_t pocketsphinx_recognize(pocketsphinx_recognizer_t *recognizer, mrcp_message_t *request, mrcp_message_t *response)
</span><span class="cx"> {
</span><ins>+ mrcp_engine_channel_t *channel = recognizer->channel;
</ins><span class="cx"> mrcp_recog_header_t *request_recog_header;
</span><span class="cx"> mrcp_recog_header_t *response_recog_header = mrcp_resource_header_prepare(response);
</span><span class="cx"> if(!response_recog_header) {
</span><span class="lines">@@ -541,16 +549,43 @@
</span><span class="cx"> if(mrcp_resource_header_property_check(request,RECOGNIZER_HEADER_START_INPUT_TIMERS) == TRUE) {
</span><span class="cx"> recognizer->is_input_timer_on = request_recog_header->start_input_timers;
</span><span class="cx"> }
</span><ins>+ if(mrcp_resource_header_property_check(request,RECOGNIZER_HEADER_NO_INPUT_TIMEOUT) == TRUE) {
+ recognizer->properties.no_input_timeout = request_recog_header->no_input_timeout;
+ }
+ if(mrcp_resource_header_property_check(request,RECOGNIZER_HEADER_RECOGNITION_TIMEOUT) == TRUE) {
+ recognizer->properties.recognition_timeout = request_recog_header->recognition_timeout;
+ }
+ if(mrcp_resource_header_property_check(request,RECOGNIZER_HEADER_SAVE_WAVEFORM) == TRUE) {
+ recognizer->properties.save_waveform = request_recog_header->save_waveform;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ /* check if waveform (utterance) should be saved */
+ if(recognizer->properties.save_waveform == TRUE) {
+ apr_status_t rv;
+ const char *waveform_file_name = apr_psprintf(channel->pool,"utter-%s-%d.pcm",
+ channel->id.buf,request->start_line.request_id);
+ char *waveform_file_path = NULL;
+ apr_filepath_merge(&waveform_file_path,recognizer->properties.save_waveform_dir,
+ waveform_file_name,0,channel->pool);
+
+ apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Open Waveform File [%s] "APT_SIDRES_FMT,
+ waveform_file_path,RECOGNIZER_SIDRES(recognizer));
+ rv = apr_file_open(&recognizer->waveform,waveform_file_path,APR_CREATE|APR_TRUNCATE|APR_WRITE|APR_BINARY,
+ APR_OS_DEFAULT,channel->pool);
+ if(rv != APR_SUCCESS) {
+ apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Cannot Open Waveform File to Write [%s] "APT_SIDRES_FMT,
+ waveform_file_path,RECOGNIZER_SIDRES(recognizer));
+ }
+ }
+
</ins><span class="cx"> response->start_line.request_state = MRCP_REQUEST_STATE_INPROGRESS;
</span><span class="cx"> /* send asynchronous response */
</span><del>- mrcp_engine_channel_message_send(recognizer->channel,response);
</del><ins>+ mrcp_engine_channel_message_send(channel,response);
</ins><span class="cx">
</span><del>-
</del><span class="cx"> /* reset */
</span><span class="cx"> mpf_activity_detector_reset(recognizer->detector);
</span><del>- recognizer->noinput_timeout = 0;
</del><ins>+ recognizer->no_input_timeout = 0;
</ins><span class="cx"> recognizer->recognition_timeout = 0;
</span><span class="cx"> recognizer->partial_result_timeout = 0;
</span><span class="cx"> recognizer->last_result = NULL;
</span><span class="lines">@@ -560,7 +595,7 @@
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/** Process GET-RESULTS request [RECOG] */
</del><ins>+/** Process GET-RESULT request [RECOG] */
</ins><span class="cx"> static apt_bool_t pocketsphinx_get_result(pocketsphinx_recognizer_t *recognizer, mrcp_message_t *request, mrcp_message_t *response)
</span><span class="cx"> {
</span><span class="cx"> if(pocketsphinx_result_build(recognizer,response) != TRUE) {
</span><span class="lines">@@ -609,6 +644,11 @@
</span><span class="cx"> recognizer->inprogress_recog = NULL;
</span><span class="cx"> ps_end_utt(recognizer->decoder);
</span><span class="cx">
</span><ins>+ if(recognizer->waveform) {
+ apr_file_close(recognizer->waveform);
+ recognizer->waveform = NULL;
+ }
+
</ins><span class="cx"> if(recognizer->stop_response) {
</span><span class="cx"> /* recognition has been stopped, send STOP response instead */
</span><span class="cx"> mrcp_message_t *response = recognizer->stop_response;
</span><span class="lines">@@ -690,13 +730,10 @@
</span><span class="cx"> static void* APR_THREAD_FUNC pocketsphinx_recognizer_run(apr_thread_t *thread, void *data)
</span><span class="cx"> {
</span><span class="cx"> pocketsphinx_recognizer_t *recognizer = data;
</span><del>- apt_bool_t status;
</del><span class="cx">
</span><span class="cx"> apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Run Recognition Thread "APT_SIDRES_FMT, RECOGNIZER_SIDRES(recognizer));
</span><del>- status = pocketsphinx_properties_load(recognizer);
-
</del><span class="cx"> /** Send response to channel_open request */
</span><del>- mrcp_engine_channel_open_respond(recognizer->channel,status);
</del><ins>+ mrcp_engine_channel_open_respond(recognizer->channel,TRUE);
</ins><span class="cx">
</span><span class="cx"> do {
</span><span class="cx"> /** Wait for MRCP requests */
</span><span class="lines">@@ -760,7 +797,7 @@
</span><span class="cx">
</span><span class="cx"> /* set request state */
</span><span class="cx"> message->start_line.request_state = MRCP_REQUEST_STATE_INPROGRESS;
</span><del>- /* send asynch event */
</del><ins>+ /* send asynchronous event */
</ins><span class="cx"> return mrcp_engine_channel_message_send(recognizer->channel,message);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -811,6 +848,12 @@
</span><span class="cx"> return TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if(recognizer->waveform) {
+ /* write utterance to file */
+ apr_size_t size = frame->codec_frame.size;
+ apr_file_write(recognizer->waveform,frame->codec_frame.buffer,&size);
+ }
+
</ins><span class="cx"> if(ps_process_raw(
</span><span class="cx"> recognizer->decoder,
</span><span class="cx"> (const int16 *)frame->codec_frame.buffer,
</span><span class="lines">@@ -835,13 +878,18 @@
</span><span class="cx"> recognizer->last_result = apr_pstrdup(recognizer->channel->pool,hyp);
</span><span class="cx"> apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Get Recognition Partial Result [%s] Score [%d] "APT_SIDRES_FMT,
</span><span class="cx"> hyp,score,RECOGNIZER_SIDRES(recognizer));
</span><ins>+
+ /* reset input timer as we have partial match now */
+ if(score != 0 && recognizer->is_input_timer_on) {
+ recognizer->is_input_timer_on = FALSE;
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if(recognizer->is_input_timer_on) {
</span><del>- recognizer->noinput_timeout += CODEC_FRAME_TIME_BASE;
- if(recognizer->noinput_timeout == recognizer->properties.noinput_timeout) {
</del><ins>+ recognizer->no_input_timeout += CODEC_FRAME_TIME_BASE;
+ if(recognizer->no_input_timeout == recognizer->properties.no_input_timeout) {
</ins><span class="cx"> apt_log(APT_LOG_MARK,APT_PRIO_INFO,"Noinput Timeout Elapsed "APT_SIDRES_FMT,
</span><span class="cx"> RECOGNIZER_SIDRES(recognizer));
</span><span class="cx"> pocketsphinx_end_of_input(recognizer,RECOGNIZER_COMPLETION_CAUSE_NO_INPUT_TIMEOUT);
</span></span></pre></div>
<a id="freeswitchtrunklibsunimrcppluginsmrcppocketsphinxsrcpocketsphinx_propertiesc"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/src/pocketsphinx_properties.c (0 => 14104)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/src/pocketsphinx_properties.c (rev 0)
+++ freeswitch/trunk/libs/unimrcp/plugins/mrcp-pocketsphinx/src/pocketsphinx_properties.c 2009-07-02 00:54:48 UTC (rev 14104)
</span><span class="lines">@@ -0,0 +1,209 @@
</span><ins>+/*
+ * Copyright 2008 Arsen Chaloyan
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <apr_xml.h>
+#include "pocketsphinx_properties.h"
+#include "apt_log.h"
+
+static const apr_xml_elem* pocketsphinx_document_load(const char *file_path, apr_pool_t *pool)
+{
+ apr_xml_parser *parser = NULL;
+ apr_xml_doc *doc = NULL;
+ const apr_xml_elem *root;
+ apr_file_t *fd = NULL;
+ apr_status_t rv;
+
+ apt_log(APT_LOG_MARK,APT_PRIO_DEBUG,"Open PocketSphinx Config File [%s]",file_path);
+ rv = apr_file_open(&fd,file_path,APR_READ|APR_BINARY,0,pool);
+ if(rv != APR_SUCCESS) {
+ apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Open PocketSphinx Config File [%s]",file_path);
+ return FALSE;
+ }
+
+ rv = apr_xml_parse_file(pool,&parser,&doc,fd,2000);
+ if(rv != APR_SUCCESS) {
+ apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Failed to Parse PocketSphinx Config File [%s]",file_path);
+ apr_file_close(fd);
+ return FALSE;
+ }
+
+ root = doc->root;
+ if(!root || strcasecmp(root->name,"pocketsphinx") != 0) {
+ apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Document <%s>",root->name);
+ apr_file_close(fd);
+ return FALSE;
+ }
+
+ apr_file_close(fd);
+ return root;
+}
+
+static apt_bool_t sensitivity_properties_load(pocketsphinx_properties_t *properties, const apr_xml_elem *elem, apr_pool_t *pool)
+{
+ const apr_xml_attr *attr;
+ for(attr = elem->attr; attr; attr = attr->next) {
+ if(strcasecmp(attr->name,"level") == 0) {
+ properties->sensitivity_level = atol(attr->value);
+ }
+ else if(strcasecmp(attr->name,"timeout") == 0) {
+ properties->sensitivity_timeout = atol(attr->value);
+ }
+ else {
+ apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr->name);
+ }
+ }
+ return TRUE;
+}
+
+static apt_bool_t timer_properties_load(pocketsphinx_properties_t *properties, const apr_xml_elem *elem, apr_pool_t *pool)
+{
+ const apr_xml_attr *attr;
+ for(attr = elem->attr; attr; attr = attr->next) {
+ if(strcasecmp(attr->name,"noinput-timeout") == 0) {
+ properties->no_input_timeout = atol(attr->value);
+ }
+ else if(strcasecmp(attr->name,"recognition-timeout") == 0) {
+ properties->recognition_timeout = atol(attr->value);
+ }
+ else {
+ apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr->name);
+ }
+ }
+ return TRUE;
+}
+
+static apt_bool_t model_properties_load(pocketsphinx_properties_t *properties, const apr_xml_elem *elem, apr_pool_t *pool)
+{
+ const apr_xml_attr *attr;
+ for(attr = elem->attr; attr; attr = attr->next) {
+ if(strcasecmp(attr->name,"dir") == 0) {
+ properties->data_dir = apr_pstrdup(pool,attr->value);
+ }
+ else if(strcasecmp(attr->name,"narrowband") == 0) {
+ properties->model_8k = apr_pstrdup(pool,attr->value);
+ }
+ else if(strcasecmp(attr->name,"wideband") == 0) {
+ properties->model_16k = apr_pstrdup(pool,attr->value);
+ }
+ else if(strcasecmp(attr->name,"dictionary") == 0) {
+ properties->dictionary = apr_pstrdup(pool,attr->value);
+ }
+ else if(strcasecmp(attr->name,"preferred") == 0) {
+ if(strcasecmp(attr->value,"narrowband") == 0) {
+ properties->preferred_model = POCKETSPHINX_MODEL_NARROWBAND;
+ }
+ else if(strcasecmp(attr->value,"wideband") == 0) {
+ properties->preferred_model = POCKETSPHINX_MODEL_WIDEBAND;
+ }
+ }
+ else {
+ apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr->name);
+ }
+ }
+ return TRUE;
+}
+
+static apt_bool_t save_waveform_properties_load(pocketsphinx_properties_t *properties, const apr_xml_elem *elem, apr_pool_t *pool)
+{
+ const apr_xml_attr *attr;
+ for(attr = elem->attr; attr; attr = attr->next) {
+ if(strcasecmp(attr->name,"dir") == 0) {
+ properties->save_waveform_dir = apr_pstrdup(pool,attr->value);
+ }
+ else if(strcasecmp(attr->name,"enable") == 0) {
+ properties->save_waveform = atoi(attr->value);
+ }
+ else {
+ apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Attribute <%s>",attr->name);
+ }
+ }
+ return TRUE;
+}
+
+apt_bool_t pocketsphinx_properties_load(pocketsphinx_properties_t *properties,
+ const char *file_path,
+ const apt_dir_layout_t *dir_layout,
+ apr_pool_t *pool)
+{
+ const apr_xml_elem *elem;
+ const apr_xml_elem *root;
+ char *path = NULL;
+
+ /* reset or set default properties */
+ properties->data_dir = NULL;
+ properties->dictionary = NULL;
+ properties->model_8k = NULL;
+ properties->model_16k = NULL;
+ properties->preferred_model = POCKETSPHINX_MODEL_NARROWBAND;
+
+ properties->no_input_timeout = 10000;
+ properties->recognition_timeout = 15000;
+ properties->partial_result_timeout = 100;
+
+ properties->save_waveform = TRUE;
+ properties->save_waveform_dir = NULL;
+
+ root = pocketsphinx_document_load(file_path,pool);
+ if(root) {
+ for(elem = root->first_child; elem; elem = elem->next) {
+ if(strcasecmp(elem->name,"sensitivity") == 0) {
+ sensitivity_properties_load(properties,elem,pool);
+ }
+ else if(strcasecmp(elem->name,"timers") == 0) {
+ timer_properties_load(properties,elem,pool);
+ }
+ else if(strcasecmp(elem->name,"model") == 0) {
+ model_properties_load(properties,elem,pool);
+ }
+ else if(strcasecmp(elem->name,"save-waveform") == 0) {
+ save_waveform_properties_load(properties,elem,pool);
+ }
+ else {
+ apt_log(APT_LOG_MARK,APT_PRIO_WARNING,"Unknown Element <%s>",elem->name);
+ }
+ }
+ }
+
+ /* verify loaded properties */
+ if(!properties->data_dir || *properties->data_dir == '\0') {
+ properties->data_dir = dir_layout->data_dir_path;
+ }
+ if(!properties->save_waveform_dir || *properties->save_waveform_dir == '\0') {
+ properties->save_waveform_dir = dir_layout->data_dir_path;
+ }
+
+ if(!properties->dictionary) {
+ properties->dictionary = "default.dic";
+ }
+ if(!properties->model_8k) {
+ properties->model_8k = "communicator";
+ }
+ if(!properties->model_16k) {
+ properties->model_16k = "wsj1";
+ }
+
+ if(apr_filepath_merge(&path,properties->data_dir,properties->dictionary,0,pool) == APR_SUCCESS) {
+ properties->dictionary = path;
+ }
+ if(apr_filepath_merge(&path,properties->data_dir,properties->model_8k,0,pool) == APR_SUCCESS) {
+ properties->model_8k = path;
+ }
+ if(apr_filepath_merge(&path,properties->data_dir,properties->model_16k,0,pool) == APR_SUCCESS) {
+ properties->model_16k = path;
+ }
+
+ return TRUE;
+}
</ins></span></pre></div>
<a id="freeswitchtrunklibsunimrcpunimrcpsln"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/unimrcp/unimrcp.sln (14103 => 14104)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/unimrcp/unimrcp.sln 2009-07-02 00:24:29 UTC (rev 14103)
+++ freeswitch/trunk/libs/unimrcp/unimrcp.sln 2009-07-02 00:54:48 UTC (rev 14104)
</span><span class="lines">@@ -148,6 +148,8 @@
</span><span class="cx"> {843425BE-9A9A-44F4-A4E3-4B57D6ABD53C} = {843425BE-9A9A-44F4-A4E3-4B57D6ABD53C}
</span><span class="cx"> EndProjectSection
</span><span class="cx"> EndProject
</span><ins>+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "preparesphinx", "build\tools\preparesphinx.vcproj", "{71D62A04-8EF6-4C6B-AC12-0C15A875E53A}"
+EndProject
</ins><span class="cx"> Global
</span><span class="cx"> GlobalSection(SolutionConfigurationPlatforms) = preSolution
</span><span class="cx"> Debug|Win32 = Debug|Win32
</span><span class="lines">@@ -252,6 +254,8 @@
</span><span class="cx"> {3C614AE8-B611-4D43-A9AF-1CAA440A9F69}.Release|Win32.ActiveCfg = Release|Win32
</span><span class="cx"> {56F6FB96-2BC7-4CAE-A8BF-6A0FAEC90556}.Debug|Win32.ActiveCfg = Debug|Win32
</span><span class="cx"> {56F6FB96-2BC7-4CAE-A8BF-6A0FAEC90556}.Release|Win32.ActiveCfg = Release|Win32
</span><ins>+ {71D62A04-8EF6-4C6B-AC12-0C15A875E53A}.Debug|Win32.ActiveCfg = Debug|Win32
+ {71D62A04-8EF6-4C6B-AC12-0C15A875E53A}.Release|Win32.ActiveCfg = Release|Win32
</ins><span class="cx"> EndGlobalSection
</span><span class="cx"> GlobalSection(SolutionProperties) = preSolution
</span><span class="cx"> HideSolutionNode = FALSE
</span><span class="lines">@@ -284,5 +288,6 @@
</span><span class="cx"> {17A33F3F-BAF5-403F-8EF4-FECDA7D9A335} = {AC4356E8-48A1-4D2D-AFB1-11CF30B974CD}
</span><span class="cx"> {01D63BF5-7798-4746-852A-4B45229BB735} = {62083CC3-13BF-49EA-BFE8-4C9337C0D82C}
</span><span class="cx"> {4714EF49-BFD5-4B22-95F7-95A07F1EAC25} = {62083CC3-13BF-49EA-BFE8-4C9337C0D82C}
</span><ins>+ {71D62A04-8EF6-4C6B-AC12-0C15A875E53A} = {62083CC3-13BF-49EA-BFE8-4C9337C0D82C}
</ins><span class="cx"> EndGlobalSection
</span><span class="cx"> EndGlobal
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>