<!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][16003] </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=16003">16003</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2009-12-18 17:19:53 -0600 (Fri, 18 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/FSCORE-517">FSCORE-517</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_module_interfacesh">freeswitch/trunk/src/include/switch_module_interfaces.h</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_codecc">freeswitch/trunk/src/switch_core_codec.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivr_play_sayc">freeswitch/trunk/src/switch_ivr_play_say.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_module_interfacesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_module_interfaces.h (16002 => 16003)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_module_interfaces.h 2009-12-18 23:00:41 UTC (rev 16002)
+++ freeswitch/trunk/src/include/switch_module_interfaces.h 2009-12-18 23:19:53 UTC (rev 16003)
</span><span class="lines">@@ -583,6 +583,7 @@
</span><span class="cx"> void *private_info;
</span><span class="cx"> switch_payload_t agreed_pt;
</span><span class="cx"> switch_mutex_t *mutex;
</span><ins>+ struct switch_codec *next;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> /*! \brief A table of settings and callbacks that define a paticular implementation of a codec */
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_codecc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_codec.c (16002 => 16003)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_codec.c 2009-12-18 23:00:41 UTC (rev 16002)
+++ freeswitch/trunk/src/switch_core_codec.c 2009-12-18 23:19:53 UTC (rev 16003)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> switch_channel_t *channel = switch_core_session_get_channel(session);
</span><span class="cx"> char tmp[30];
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><del>-
</del><ins>+
</ins><span class="cx"> switch_mutex_lock(session->codec_read_mutex);
</span><span class="cx">
</span><span class="cx"> if (codec && (!codec->implementation || !switch_core_codec_ready(codec))) {
</span><span class="lines">@@ -109,6 +109,9 @@
</span><span class="cx"> session->read_codec = session->real_read_codec = codec;
</span><span class="cx"> session->read_impl = *codec->implementation;
</span><span class="cx"> } else {
</span><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Push codec %s:%d\n",
+ switch_channel_get_name(session->channel), codec->implementation->iananame, codec->implementation->ianacode);
+ codec->next = session->read_codec;
</ins><span class="cx"> session->read_codec = codec;
</span><span class="cx"> session->read_impl = *codec->implementation;
</span><span class="cx"> }
</span><span class="lines">@@ -116,7 +119,17 @@
</span><span class="cx"> if (session->read_codec == session->real_read_codec) {
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><del>- if (session->real_read_codec) {
</del><ins>+
+ if (session->read_codec->next) {
+ switch_codec_t *old = session->read_codec;
+ session->read_codec = session->read_codec->next;
+ session->read_impl = *session->read_codec->implementation;
+ old->next = NULL;
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Restore previous codec %s:%d.\n",
+ switch_channel_get_name(session->channel),
+ session->read_codec->implementation->iananame, session->read_codec->implementation->ianacode);
+
+ } else if (session->real_read_codec) {
</ins><span class="cx"> session->read_codec = session->real_read_codec;
</span><span class="cx"> session->read_impl = *session->real_read_codec->implementation;
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Restore original codec.\n");
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_play_sayc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_play_say.c (16002 => 16003)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_play_say.c 2009-12-18 23:00:41 UTC (rev 16002)
+++ freeswitch/trunk/src/switch_ivr_play_say.c 2009-12-18 23:19:53 UTC (rev 16003)
</span><span class="lines">@@ -1081,7 +1081,7 @@
</span><span class="cx"> read_impl.number_of_channels,
</span><span class="cx"> read_impl.actual_samples_per_second,
</span><span class="cx"> SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_core_session_reset(session, SWITCH_TRUE, SWITCH_TRUE);
</del><ins>+ switch_core_session_reset(session, SWITCH_TRUE, SWITCH_FALSE);
</ins><span class="cx"> status = SWITCH_STATUS_NOTFOUND;
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="lines">@@ -1159,7 +1159,7 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
</span><span class="cx"> "Raw Codec Activation Failed %s@%uhz %u channels %dms\n", codec_name, fh->samplerate, fh->channels, interval);
</span><span class="cx"> switch_core_file_close(fh);
</span><del>- switch_core_session_reset(session, SWITCH_TRUE, SWITCH_TRUE);
</del><ins>+ switch_core_session_reset(session, SWITCH_TRUE, SWITCH_FALSE);
</ins><span class="cx"> status = SWITCH_STATUS_GENERR;
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="lines">@@ -1179,7 +1179,7 @@
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Setup timer failed!\n");
</span><span class="cx"> switch_core_codec_destroy(&codec);
</span><span class="cx"> switch_core_file_close(fh);
</span><del>- switch_core_session_reset(session, SWITCH_TRUE, SWITCH_TRUE);
</del><ins>+ switch_core_session_reset(session, SWITCH_TRUE, SWITCH_FALSE);
</ins><span class="cx"> status = SWITCH_STATUS_GENERR;
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="lines">@@ -1476,7 +1476,7 @@
</span><span class="cx">
</span><span class="cx"> switch_safe_free(abuf);
</span><span class="cx">
</span><del>- switch_core_session_reset(session, SWITCH_FALSE, SWITCH_TRUE);
</del><ins>+ switch_core_session_reset(session, SWITCH_FALSE, SWITCH_FALSE);
</ins><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1513,7 +1513,7 @@
</span><span class="cx"> read_impl.number_of_channels,
</span><span class="cx"> read_impl.actual_samples_per_second,
</span><span class="cx"> SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_core_session_reset(session, SWITCH_TRUE, SWITCH_TRUE);
</del><ins>+ switch_core_session_reset(session, SWITCH_TRUE, SWITCH_FALSE);
</ins><span class="cx"> return SWITCH_STATUS_NOTFOUND;
</span><span class="cx"> }
</span><span class="cx"> switch_zmalloc(abuf, SWITCH_RECOMMENDED_BUFFER_SIZE);
</span><span class="lines">@@ -2100,7 +2100,7 @@
</span><span class="cx">
</span><span class="cx"> timer_name = switch_channel_get_variable(channel, "timer_name");
</span><span class="cx">
</span><del>- switch_core_session_reset(session, SWITCH_FALSE, SWITCH_TRUE);
</del><ins>+ switch_core_session_reset(session, SWITCH_FALSE, SWITCH_FALSE);
</ins><span class="cx"> read_codec = switch_core_session_get_read_codec(session);
</span><span class="cx">
</span><span class="cx"> rate = read_impl.actual_samples_per_second;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>