<!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][17486] </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=17486">17486</a></dd>
<dt>Author</dt> <dd>brian</dd>
<dt>Date</dt> <dd>2010-05-04 16:03:43 -0500 (Tue, 04 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>reset codecs after media bugs</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeprivateswitch_core_pvth">freeswitch/trunk/src/include/private/switch_core_pvt.h</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_coreh">freeswitch/trunk/src/include/switch_core.h</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_codecc">freeswitch/trunk/src/switch_core_codec.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_ioc">freeswitch/trunk/src/switch_core_io.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_media_bugc">freeswitch/trunk/src/switch_core_media_bug.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeprivateswitch_core_pvth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h (17485 => 17486)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/private/switch_core_pvt.h 2010-05-04 20:48:36 UTC (rev 17485)
+++ freeswitch/trunk/src/include/private/switch_core_pvt.h 2010-05-04 21:03:43 UTC (rev 17486)
</span><span class="lines">@@ -94,7 +94,11 @@
</span><span class="cx"> SSF_WARN_TRANSCODE = (1 << 1),
</span><span class="cx"> SSF_HANGUP = (1 << 2),
</span><span class="cx"> SSF_THREAD_STARTED = (1 << 3),
</span><del>- SSF_THREAD_RUNNING = (1 << 4)
</del><ins>+ SSF_THREAD_RUNNING = (1 << 4),
+ SSF_READ_TRANSCODE = (1 << 5),
+ SSF_WRITE_TRANSCODE = (1 << 6),
+ SSF_READ_CODEC_RESET = (1 << 7),
+ SSF_WRITE_CODEC_RESET = (1 << 8)
</ins><span class="cx"> } switch_session_flag_t;
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_coreh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_core.h (17485 => 17486)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_core.h 2010-05-04 20:48:36 UTC (rev 17485)
+++ freeswitch/trunk/src/include/switch_core.h 2010-05-04 21:03:43 UTC (rev 17486)
</span><span class="lines">@@ -1329,6 +1329,7 @@
</span><span class="cx"> uint32_t flags, const switch_codec_settings_t *codec_settings, switch_memory_pool_t *pool);
</span><span class="cx">
</span><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_core_codec_copy(switch_codec_t *codec, switch_codec_t *new_codec, switch_memory_pool_t *pool);
</span><ins>+SWITCH_DECLARE(switch_status_t) switch_core_codec_reset(switch_codec_t *codec);
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> \brief Encode data using a codec handle
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_codecc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_codec.c (17485 => 17486)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_codec.c 2010-05-04 20:48:36 UTC (rev 17485)
+++ freeswitch/trunk/src/switch_core_codec.c 2010-05-04 21:03:43 UTC (rev 17486)
</span><span class="lines">@@ -455,6 +455,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(switch_status_t) switch_core_codec_reset(switch_codec_t *codec)
+{
+ switch_assert(codec != NULL);
+
+ codec->implementation->destroy(codec);
+ codec->implementation->init(codec, codec->flags, NULL);
+
+ return SWITCH_STATUS_SUCCESS;
+}
+
+
</ins><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_core_codec_copy(switch_codec_t *codec, switch_codec_t *new_codec, switch_memory_pool_t *pool)
</span><span class="cx"> {
</span><span class="cx"> switch_status_t status;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_ioc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_io.c (17485 => 17486)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_io.c 2010-05-04 20:48:36 UTC (rev 17485)
+++ freeswitch/trunk/src/switch_core_io.c 2010-05-04 21:03:43 UTC (rev 17486)
</span><span class="lines">@@ -214,8 +214,8 @@
</span><span class="cx">
</span><span class="cx"> if (session->read_codec->implementation->impl_id != codec_impl.impl_id) {
</span><span class="cx"> need_codec = TRUE;
</span><del>- }
-
</del><ins>+ }
+
</ins><span class="cx"> if (codec_impl.actual_samples_per_second != session->read_impl.actual_samples_per_second) {
</span><span class="cx"> do_resample = 1;
</span><span class="cx"> }
</span><span class="lines">@@ -225,9 +225,34 @@
</span><span class="cx"> need_codec = 1;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (switch_test_flag(session, SSF_READ_TRANSCODE) && !need_codec && switch_core_codec_ready(session->read_codec)) {
+ switch_core_session_t *other_session;
+ const char *uuid = switch_channel_get_variable(switch_core_session_get_channel(session), SWITCH_SIGNAL_BOND_VARIABLE);
+ switch_clear_flag(session, SSF_READ_TRANSCODE);
+
+ if (uuid && (other_session = switch_core_session_locate(uuid))) {
+ switch_set_flag(other_session, SSF_READ_CODEC_RESET);
+ switch_set_flag(other_session, SSF_READ_CODEC_RESET);
+ switch_set_flag(other_session, SSF_WRITE_CODEC_RESET);
+ switch_core_session_rwunlock(other_session);
+ }
+ }
+
+ if (switch_test_flag(session, SSF_READ_CODEC_RESET)) {
+ switch_core_codec_reset(session->read_codec);
+ switch_clear_flag(session, SSF_READ_CODEC_RESET);
+ }
+
+
+
+
+
+
</ins><span class="cx"> if (status == SWITCH_STATUS_SUCCESS && need_codec) {
</span><span class="cx"> switch_frame_t *enc_frame, *read_frame = *frame;
</span><span class="cx">
</span><ins>+ switch_set_flag(session, SSF_READ_TRANSCODE);
+
</ins><span class="cx"> if (!switch_test_flag(session, SSF_WARN_TRANSCODE)) {
</span><span class="cx"> switch_core_session_message_t msg = { 0 };
</span><span class="cx">
</span><span class="lines">@@ -640,6 +665,26 @@
</span><span class="cx"> do_resample = TRUE;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (switch_test_flag(session, SSF_WRITE_TRANSCODE) && !need_codec && switch_core_codec_ready(session->write_codec)) {
+ switch_core_session_t *other_session;
+ const char *uuid = switch_channel_get_variable(switch_core_session_get_channel(session), SWITCH_SIGNAL_BOND_VARIABLE);
+
+ if (uuid && (other_session = switch_core_session_locate(uuid))) {
+ switch_set_flag(other_session, SSF_READ_CODEC_RESET);
+ switch_set_flag(other_session, SSF_READ_CODEC_RESET);
+ switch_set_flag(other_session, SSF_WRITE_CODEC_RESET);
+ switch_core_session_rwunlock(other_session);
+ }
+
+ switch_clear_flag(session, SSF_WRITE_TRANSCODE);
+ }
+
+
+ if (switch_test_flag(session, SSF_WRITE_CODEC_RESET)) {
+ switch_core_codec_reset(session->write_codec);
+ switch_clear_flag(session, SSF_WRITE_CODEC_RESET);
+ }
+
</ins><span class="cx"> if (!need_codec) {
</span><span class="cx"> do_write = TRUE;
</span><span class="cx"> write_frame = frame;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_media_bugc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_media_bug.c (17485 => 17486)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_media_bug.c 2010-05-04 20:48:36 UTC (rev 17485)
+++ freeswitch/trunk/src/switch_core_media_bug.c 2010-05-04 21:03:43 UTC (rev 17486)
</span><span class="lines">@@ -47,6 +47,11 @@
</span><span class="cx"> switch_buffer_destroy(&bug->raw_write_buffer);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (switch_core_codec_ready(&bug->session->bug_codec)) {
+ switch_core_codec_destroy(&bug->session->bug_codec);
+ memset(&bug->session->bug_codec, 0, sizeof(bug->session->bug_codec));
+ }
+
</ins><span class="cx"> if (switch_event_create(&event, SWITCH_EVENT_MEDIA_BUG_STOP) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Media-Bug-Function", "%s", bug->function);
</span><span class="cx"> switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Media-Bug-Target", "%s", bug->target);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>