<!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][15528] </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=15528">15528</a></dd>
<dt>Author</dt> <dd>crienzo</dd>
<dt>Date</dt> <dd>2009-11-18 13:48:34 -0600 (Wed, 18 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add enable-profile-events param to mod_unimrcp</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodasr_ttsmod_unimrcpmod_unimrcpc">freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodasr_ttsmod_unimrcpmod_unimrcpc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c (15527 => 15528)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c 2009-11-18 19:48:09 UTC (rev 15527)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c 2009-11-18 19:48:34 UTC (rev 15528)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> * Contributor(s):
</span><span class="cx"> *
</span><span class="cx"> * Brian West <brian@freeswitch.org>
</span><ins>+ * Christopher M. Rienzo <chris@rienzo.net>
</ins><span class="cx"> *
</span><span class="cx"> * mod_unimrcp.c -- UniMRCP module (MRCP client)
</span><span class="cx"> *
</span><span class="lines">@@ -92,8 +93,12 @@
</span><span class="cx"> char *unimrcp_default_synth_profile;
</span><span class="cx"> /** default-asr-profile config */
</span><span class="cx"> char *unimrcp_default_recog_profile;
</span><del>- /** log level for UniMRCP library */
</del><ins>+ /** log level for UniMRCP library */
</ins><span class="cx"> char *unimrcp_log_level;
</span><ins>+ /** profile events configuration param */
+ char *enable_profile_events_param;
+ /** True if profile events are wanted */
+ int enable_profile_events;
</ins><span class="cx"> /** the MRCP client stack */
</span><span class="cx"> mrcp_client_t *mrcp_client;
</span><span class="cx"> /** synthesizer application */
</span><span class="lines">@@ -131,6 +136,11 @@
</span><span class="cx"> typedef struct profile profile_t;
</span><span class="cx"> static switch_status_t profile_create(profile_t **profile, const char *name, switch_memory_pool_t *pool);
</span><span class="cx">
</span><ins>+/* Profile events that may be monitored. Useful for tracking MRCP profile utilization */
+#define MY_EVENT_PROFILE_CREATE "unimrcp::profile_create"
+#define MY_EVENT_PROFILE_OPEN "unimrcp::profile_open"
+#define MY_EVENT_PROFILE_CLOSE "unimrcp::profile_close"
+
</ins><span class="cx"> /**
</span><span class="cx"> * Defines XML parsing instructions
</span><span class="cx"> */
</span><span class="lines">@@ -141,6 +151,7 @@
</span><span class="cx"> SWITCH_CONFIG_ITEM_STRING_STRDUP("default-tts-profile", CONFIG_REQUIRED, &globals.unimrcp_default_synth_profile, "default", "", "The default profile to use for TTS"),
</span><span class="cx"> SWITCH_CONFIG_ITEM_STRING_STRDUP("default-asr-profile", CONFIG_REQUIRED, &globals.unimrcp_default_recog_profile, "default", "", "The default profile to use for ASR"),
</span><span class="cx"> SWITCH_CONFIG_ITEM_STRING_STRDUP("log-level", CONFIG_REQUIRED, &globals.unimrcp_log_level, "WARNING", "EMERGENCY|ALERT|CRITICAL|ERROR|WARNING|NOTICE|INFO|DEBUG", "Logging level for UniMRCP"),
</span><ins>+ SWITCH_CONFIG_ITEM_STRING_STRDUP("enable-profile-events", CONFIG_REQUIRED, &globals.enable_profile_events_param, "false", "", "Fire profile events (true|false)"),
</ins><span class="cx"> SWITCH_CONFIG_ITEM_END()
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -297,7 +308,7 @@
</span><span class="cx"> char *codec;
</span><span class="cx"> /** rate */
</span><span class="cx"> uint16_t rate;
</span><del>- /** silence byte */
</del><ins>+ /** silence sample */
</ins><span class="cx"> int silence;
</span><span class="cx"> /** speech channel params */
</span><span class="cx"> switch_hash_t *params;
</span><span class="lines">@@ -466,6 +477,7 @@
</span><span class="cx"> {
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><span class="cx"> profile_t *lprofile = NULL;
</span><ins>+ switch_event_t *event = NULL;
</ins><span class="cx">
</span><span class="cx"> lprofile = (profile_t *)switch_core_alloc(pool, sizeof(profile_t));
</span><span class="cx"> if (lprofile) {
</span><span class="lines">@@ -475,6 +487,11 @@
</span><span class="cx"> lprofile->gsl_mime_type = "application/x-nuance-gsl";
</span><span class="cx"> lprofile->jsgf_mime_type = "application/x-jsgf";
</span><span class="cx"> *profile = lprofile;
</span><ins>+
+ if (globals.enable_profile_events && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_PROFILE_CREATE) == SWITCH_STATUS_SUCCESS) {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "MRCP-Profile", lprofile->name);
+ switch_event_fire(&event);
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> *profile = NULL;
</span><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="lines">@@ -1437,8 +1454,7 @@
</span><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><del>- if (speech_channel_open(schannel, profile) != SWITCH_STATUS_SUCCESS) {
- status = SWITCH_STATUS_FALSE;
</del><ins>+ if ((status = speech_channel_open(schannel, profile)) != SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1620,10 +1636,23 @@
</span><span class="cx"> */
</span><span class="cx"> static apt_bool_t speech_on_channel_add(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status)
</span><span class="cx"> {
</span><ins>+ switch_event_t *event = NULL;
</ins><span class="cx"> speech_channel_t *schannel = (speech_channel_t *)mrcp_application_channel_object_get(channel);
</span><ins>+
+ /* check status */
</ins><span class="cx"> if (session && schannel && status == MRCP_SIG_STATUS_CODE_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "(%s) %s channel is ready\n", schannel->name, speech_channel_type_to_string(schannel->type));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "(%s) %s channel is ready\n", schannel->name, speech_channel_type_to_string(schannel->type));
</ins><span class="cx"> speech_channel_set_state(schannel, SPEECH_CHANNEL_READY);
</span><ins>+ /* notify of channel open */
+ if (globals.enable_profile_events && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_PROFILE_OPEN) == SWITCH_STATUS_SUCCESS) {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "MRCP-Profile", schannel->profile->name);
+ if (schannel->type == SPEECH_CHANNEL_SYNTHESIZER) {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "MRCP-Resource-Type", "TTS");
+ } else {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "MRCP-Resource-Type", "ASR");
+ }
+ switch_event_fire(&event);
+ }
</ins><span class="cx"> } else {
</span><span class="cx"> if (schannel) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) %s channel error!\n", schannel->name, speech_channel_type_to_string(schannel->type));
</span><span class="lines">@@ -1651,10 +1680,25 @@
</span><span class="cx"> */
</span><span class="cx"> static apt_bool_t speech_on_channel_remove(mrcp_application_t *application, mrcp_session_t *session, mrcp_channel_t *channel, mrcp_sig_status_code_e status)
</span><span class="cx"> {
</span><ins>+ switch_event_t *event = NULL;
</ins><span class="cx"> speech_channel_t *schannel = (speech_channel_t *)mrcp_application_channel_object_get(channel);
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "(%s) %s channel is removed\n", schannel->name, speech_channel_type_to_string(schannel->type));
</span><span class="cx"> schannel->unimrcp_channel = NULL;
</span><del>-
</del><ins>+
+ /* notify of channel close */
+ if (globals.enable_profile_events) {
+ switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_PROFILE_CLOSE);
+ if (event) {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "MRCP-Profile", schannel->profile->name);
+ if (schannel->type == SPEECH_CHANNEL_SYNTHESIZER) {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "MRCP-Resource-Type", "TTS");
+ } else {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "MRCP-Resource-Type", "ASR");
+ }
+ switch_event_fire(&event);
+ }
+ }
+
</ins><span class="cx"> if (session) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) Terminating MRCP session\n", schannel->name);
</span><span class="cx"> mrcp_application_session_terminate(session);
</span><span class="lines">@@ -2720,7 +2764,7 @@
</span><span class="cx"> switch_core_hash_destroy(&r->grammars);
</span><span class="cx">
</span><span class="cx"> /* this lets FreeSWITCH's speech_thread know the handle is closed */
</span><del>- switch_set_flag(ah, SWITCH_ASR_FLAG_CLOSED);
</del><ins>+ switch_set_flag(ah, SWITCH_ASR_FLAG_CLOSED);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -3120,7 +3164,7 @@
</span><span class="cx"> if ((settings = switch_xml_child(cfg, "settings"))) {
</span><span class="cx"> if (switch_xml_config_parse(switch_xml_child(settings, "param"), SWITCH_FALSE, instructions) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,"Config parsed ok!\n");
</span><del>- goto done;
</del><ins>+ globals.enable_profile_events = !zstr(globals.enable_profile_events_param) && (!strcasecmp(globals.enable_profile_events_param, "true") || !strcmp(globals.enable_profile_events_param, "1"));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>