<!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][15570] </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=15570">15570</a></dd>
<dt>Author</dt> <dd>crienzo</dd>
<dt>Date</dt> <dd>2009-11-20 09:12:50 -0600 (Fri, 20 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>support resampling for TTS (UniMRCP 0.8.0 only)</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 (15569 => 15570)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c 2009-11-20 05:31:17 UTC (rev 15569)
+++ freeswitch/trunk/src/mod/asr_tts/mod_unimrcp/mod_unimrcp.c 2009-11-20 15:12:50 UTC (rev 15570)
</span><span class="lines">@@ -308,8 +308,6 @@
</span><span class="cx"> speech_channel_state_t state;
</span><span class="cx"> /** UniMRCP <--> FreeSWITCH audio buffer */
</span><span class="cx"> audio_queue_t *audio_queue;
</span><del>- /** codec */
- char *codec;
</del><span class="cx"> /** rate */
</span><span class="cx"> uint16_t rate;
</span><span class="cx"> /** silence sample */
</span><span class="lines">@@ -327,7 +325,8 @@
</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><span class="cx"> /* speech_channel funcs */
</span><del>-static switch_status_t speech_channel_create(speech_channel_t **schannel, const char *name, speech_channel_type_t type, mod_unimrcp_application_t *app, const char *codec, uint16_t rate, switch_memory_pool_t *pool);
</del><ins>+static switch_status_t speech_channel_create(speech_channel_t **schannel, const char *name, speech_channel_type_t type, mod_unimrcp_application_t *app, uint16_t rate, switch_memory_pool_t *pool);
+static mpf_termination_t *speech_channel_create_mpf_termination(speech_channel_t *schannel);
</ins><span class="cx"> static switch_status_t speech_channel_open(speech_channel_t *schannel, profile_t *profile);
</span><span class="cx"> static switch_status_t speech_channel_destroy(speech_channel_t *schannel);
</span><span class="cx"> static switch_status_t speech_channel_stop(speech_channel_t *schannel);
</span><span class="lines">@@ -635,7 +634,7 @@
</span><span class="cx"> if (switch_buffer_write(queue->buffer, data, *data_len) > 0) {
</span><span class="cx"> queue->write_bytes = queue->write_bytes + *data_len;
</span><span class="cx"> #ifdef MOD_UNIMRCP_DEBUG_AUDIO_QUEUE
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) audio queue write total = %d\trequested = %d\n", queue->name, queue->write_bytes, *data_len);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) audio queue write total = %ld\trequested = %ld\n", queue->name, queue->write_bytes, *data_len);
</ins><span class="cx"> #endif
</span><span class="cx"> if (queue->waiting <= switch_buffer_inuse(queue->buffer)) {
</span><span class="cx"> switch_thread_cond_signal(queue->cond);
</span><span class="lines">@@ -690,7 +689,7 @@
</span><span class="cx"> *data_len = switch_buffer_read(queue->buffer, data, requested);
</span><span class="cx"> queue->read_bytes = queue->read_bytes + *data_len;
</span><span class="cx"> #ifdef MOD_UNIMRCP_DEBUG_AUDIO_QUEUE
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) audio queue read total = %d\tread = %d\trequested = %d\n", queue->name, queue->read_bytes, *data_len, requested);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) audio queue read total = %ld\tread = %ld\trequested = %ld\n", queue->name, queue->read_bytes, *data_len, requested);
</ins><span class="cx"> switch_size_t len = *data_len;
</span><span class="cx"> if (queue->file_read) {
</span><span class="cx"> switch_file_write(queue->file_read, data, &len);
</span><span class="lines">@@ -764,12 +763,11 @@
</span><span class="cx"> * @param name the name of the channel
</span><span class="cx"> * @param type the type of channel to create
</span><span class="cx"> * @param app the application
</span><del>- * @param codec the codec to use
</del><span class="cx"> * @param rate the rate to use
</span><span class="cx"> * @param pool the memory pool to use
</span><span class="cx"> * @return SWITCH_STATUS_SUCCESS if successful. SWITCH_STATUS_FALSE if the channel cannot be allocated.
</span><span class="cx"> */
</span><del>-static switch_status_t speech_channel_create(speech_channel_t **schannel, const char *name, speech_channel_type_t type, mod_unimrcp_application_t *app, const char *codec, uint16_t rate, switch_memory_pool_t *pool)
</del><ins>+static switch_status_t speech_channel_create(speech_channel_t **schannel, const char *name, speech_channel_type_t type, mod_unimrcp_application_t *app, uint16_t rate, switch_memory_pool_t *pool)
</ins><span class="cx"> {
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><span class="cx"> speech_channel_t *schan = NULL;
</span><span class="lines">@@ -786,14 +784,7 @@
</span><span class="cx"> schan->memory_pool = pool;
</span><span class="cx"> schan->params = NULL;
</span><span class="cx"> schan->rate = rate;
</span><del>- schan->codec = switch_core_strdup(pool, codec);
-
- if (!strcmp("L16", schan->codec)) {
- schan->silence = 0;
- } else {
- /* 8-bit PCMU, PCMA */
- schan->silence = 128;
- }
</del><ins>+ schan->silence = 0; /* L16 silence sample */
</ins><span class="cx">
</span><span class="cx"> if (switch_mutex_init(&schan->mutex, SWITCH_MUTEX_UNNESTED, pool) != SWITCH_STATUS_SUCCESS ||
</span><span class="cx"> switch_thread_cond_create(&schan->cond, pool) != SWITCH_STATUS_SUCCESS ||
</span><span class="lines">@@ -841,6 +832,63 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><ins>+ * Create the audio termination for the speech channel
+ * @param schannel the speech channel
+ * @return the termination or NULL
+ */
+#if UNI_VERSION_AT_LEAST(0,8,0)
+static mpf_termination_t *speech_channel_create_mpf_termination(speech_channel_t *schannel)
+{
+ mpf_termination_t *termination = NULL;
+ mpf_stream_capabilities_t *capabilities = NULL;
+ int sample_rates;
+
+ if (schannel->type == SPEECH_CHANNEL_SYNTHESIZER) {
+ capabilities = mpf_sink_stream_capabilities_create(schannel->unimrcp_session->pool);
+ } else {
+ capabilities = mpf_source_stream_capabilities_create(schannel->unimrcp_session->pool);
+ }
+ /* FreeSWITCH is capable of resampling so pick rates that are are multiples of the desired rate.
+ * UniMRCP should transcode whatever the MRCP server wants to use into LPCM (host-byte ordered L16) for us.
+ */
+ if (schannel->rate == 16000) {
+ sample_rates = MPF_SAMPLE_RATE_8000 | MPF_SAMPLE_RATE_16000;
+ } else if (schannel->rate == 32000) {
+ sample_rates = MPF_SAMPLE_RATE_8000 | MPF_SAMPLE_RATE_16000 | MPF_SAMPLE_RATE_32000;
+ } else if (schannel->rate == 48000) {
+ sample_rates = MPF_SAMPLE_RATE_8000 | MPF_SAMPLE_RATE_16000 | MPF_SAMPLE_RATE_48000;
+ } else {
+ sample_rates = MPF_SAMPLE_RATE_8000;
+ }
+ mpf_codec_capabilities_add(&capabilities->codecs, sample_rates, "LPCM");
+ termination = mrcp_application_audio_termination_create(schannel->unimrcp_session, &schannel->application->audio_stream_vtable, capabilities, schannel);
+
+ return termination;
+}
+#else
+static mpf_termination_t *speech_channel_create_mpf_termination(speech_channel_t *schannel)
+{
+ mpf_termination_t *termination = NULL;
+ mpf_codec_descriptor_t *codec = NULL;
+ codec = (mpf_codec_descriptor_t *)apr_palloc(schannel->unimrcp_session->pool, sizeof(mpf_codec_descriptor_t));
+ mpf_codec_descriptor_init(codec);
+ codec->channel_count = 1;
+ codec->payload_type = 96;
+ codec->sampling_rate = schannel->rate;
+ apt_string_set(&codec->name, "LPCM"); /* "LPCM" is UniMRCP's name for L16 host byte ordered */
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) requesting codec LPCM/%d/%d\n", schannel->name, codec->payload_type, codec->sampling_rate);
+
+ if (schannel->type == SPEECH_CHANNEL_SYNTHESIZER) {
+ termination = mrcp_application_sink_termination_create(schannel->unimrcp_session, &schannel->application->audio_stream_vtable, codec, schannel);
+ } else {
+ termination = mrcp_application_source_termination_create(schannel->unimrcp_session, &schannel->application->audio_stream_vtable, codec, schannel);
+ }
+
+ return termination;
+}
+#endif
+
+/**
</ins><span class="cx"> * Open the speech channel
</span><span class="cx"> *
</span><span class="cx"> * @param schannel the channel to open
</span><span class="lines">@@ -851,7 +899,6 @@
</span><span class="cx"> {
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><span class="cx"> mpf_termination_t *termination = NULL;
</span><del>- mpf_codec_descriptor_t *codec = NULL;
</del><span class="cx"> mrcp_resource_type_e resource_type;
</span><span class="cx">
</span><span class="cx"> switch_mutex_lock(schannel->mutex);
</span><span class="lines">@@ -871,32 +918,9 @@
</span><span class="cx"> status = SWITCH_STATUS_RESTART;
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><del>-
- /* create RTP endpoint and link to session channel */
- codec = (mpf_codec_descriptor_t *)apr_palloc(schannel->unimrcp_session->pool, sizeof(mpf_codec_descriptor_t));
- mpf_codec_descriptor_init(codec);
- codec->channel_count = 1;
- codec->payload_type = 96;
- codec->sampling_rate = schannel->rate;
- if (!strcmp(schannel->codec, "L16")) {
- /* "LPCM" is UniMRCP's name for L16 host byte ordered */
- apt_string_set(&codec->name, "LPCM");
- } else {
- apt_string_set(&codec->name, schannel->codec);
- }
- /* see RFC 1890 for payload types */
- if (!strcmp(schannel->codec, "PCMU") && schannel->rate == 8000) {
- codec->payload_type = 0;
- } else if (!strcmp(schannel->codec, "PCMA") && schannel->rate == 8000) {
- codec->payload_type = 8;
- }
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) requesting codec %s/%d/%d\n", schannel->name, schannel->codec, codec->payload_type, codec->sampling_rate);
- if(schannel->type == SPEECH_CHANNEL_SYNTHESIZER) {
- termination = mrcp_application_sink_termination_create(schannel->unimrcp_session, &schannel->application->audio_stream_vtable, codec, schannel);
- } else {
- termination = mrcp_application_source_termination_create(schannel->unimrcp_session, &schannel->application->audio_stream_vtable, codec, schannel);
- }
- if(termination == NULL) {
</del><ins>+
+ /* create audio termination and add to channel */
+ if ((termination = speech_channel_create_mpf_termination(schannel)) == NULL) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "(%s) Unable to create termination with %s\n", schannel->name, profile->name);
</span><span class="cx"> mrcp_application_session_destroy(schannel->unimrcp_session);
</span><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="lines">@@ -1441,8 +1465,7 @@
</span><span class="cx"> switch_snprintf(name, sizeof(name) - 1, "TTS-%d", speech_channel_number);
</span><span class="cx"> name[sizeof(name) - 1] = '\0';
</span><span class="cx">
</span><del>- /* create channel container with L16 codec (what FreeSWITCH needs) */
- if (speech_channel_create(&schannel, name, SPEECH_CHANNEL_SYNTHESIZER, &globals.synth, "L16", (uint16_t)rate, sh->memory_pool) != SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (speech_channel_create(&schannel, name, SPEECH_CHANNEL_SYNTHESIZER, &globals.synth, (uint16_t)rate, sh->memory_pool) != SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="lines">@@ -1530,7 +1553,7 @@
</span><span class="cx"> /* pad data, if not enough read */
</span><span class="cx"> if (bytes_read < *datalen) {
</span><span class="cx"> #ifdef MOD_UNIMRCP_DEBUG_AUDIO_QUEUE
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) adding %d bytes of padding\n", schannel->name, *datalen - bytes_read);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) adding %ld bytes of padding\n", schannel->name, *datalen - bytes_read);
</ins><span class="cx"> #endif
</span><span class="cx"> memset((uint8_t *)data + bytes_read, schannel->silence, *datalen - bytes_read);
</span><span class="cx"> }
</span><span class="lines">@@ -1539,6 +1562,11 @@
</span><span class="cx"> status = SWITCH_STATUS_BREAK;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) rate = %d, native_rate = %d, samplerate = %d\n", schannel->name, sh->rate, sh->native_rate, sh->samplerate);
+
+ /* report negotiated sample rate back to FreeSWITCH */
+ sh->native_rate = schannel->rate;
+
</ins><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1645,7 +1673,23 @@
</span><span class="cx">
</span><span class="cx"> /* check status */
</span><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>+#if UNI_VERSION_AT_LEAST(0,8,0)
+ char codec_name[60] = { 0 };
+ const mpf_codec_descriptor_t *descriptor;
+ /* what sample rate did we negotiate? */
+ if (schannel->type == SPEECH_CHANNEL_SYNTHESIZER) {
+ descriptor = mrcp_application_sink_descriptor_get(channel);
+ } else {
+ descriptor = mrcp_application_source_descriptor_get(channel);
+ }
+ schannel->rate = descriptor->sampling_rate;
+ if (descriptor->name.length) {
+ strncpy(codec_name, descriptor->name.buf, sizeof(codec_name));
+ }
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) %s channel is ready, codec = %s, sample rate = %d\n", schannel->name, speech_channel_type_to_string(schannel->type), codec_name, schannel->rate);
+#else
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "(%s) %s channel is ready\n", schannel->name, speech_channel_type_to_string(schannel->type));
+#endif
</ins><span class="cx"> speech_channel_set_state(schannel, SPEECH_CHANNEL_READY);
</span><span class="cx"> /* notify of channel open */
</span><span class="cx"> if (globals.enable_profile_events && switch_event_create_subclass(&event, SWITCH_EVENT_CUSTOM, MY_EVENT_PROFILE_OPEN) == SWITCH_STATUS_SUCCESS) {
</span><span class="lines">@@ -2575,7 +2619,7 @@
</span><span class="cx"> switch_snprintf(name, sizeof(name) - 1, "ASR-%d", speech_channel_number);
</span><span class="cx"> name[sizeof(name) - 1] = '\0';
</span><span class="cx">
</span><del>- if (speech_channel_create(&schannel, name, SPEECH_CHANNEL_RECOGNIZER, &globals.recog, "L16", (uint16_t)rate, ah->memory_pool) != SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (speech_channel_create(&schannel, name, SPEECH_CHANNEL_RECOGNIZER, &globals.recog, (uint16_t)rate, ah->memory_pool) != SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>