<!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][15235] </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=15235">15235</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-10-26 16:59:25 -0500 (Mon, 26 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/IRC-00">IRC-00</a> refactor how record_answer_req=true works, add media_bug_answer_req=true variable and backport record_answer_req=true to use it</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_typesh">freeswitch/trunk/src/include/switch_types.h</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>
<li><a href="#freeswitchtrunksrcswitch_ivr_asyncc">freeswitch/trunk/src/switch_ivr_async.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_typesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_types.h (15234 => 15235)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_types.h 2009-10-26 21:46:21 UTC (rev 15234)
+++ freeswitch/trunk/src/include/switch_types.h 2009-10-26 21:59:25 UTC (rev 15235)
</span><span class="lines">@@ -1120,7 +1120,7 @@
</span><span class="cx"> SMBF_READ_REPLACE = (1 << 3),
</span><span class="cx"> SMBF_READ_PING = (1 << 4),
</span><span class="cx"> SMBF_STEREO = (1 << 5),
</span><del>- SMBF_RECORD_ANSWER_REQ = (1 << 6),
</del><ins>+ SMBF_ANSWER_REQ = (1 << 6),
</ins><span class="cx"> SMBF_THREAD_LOCK = (1 << 7)
</span><span class="cx"> } switch_media_bug_flag_enum_t;
</span><span class="cx"> typedef uint32_t switch_media_bug_flag_t;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_ioc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_io.c (15234 => 15235)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_io.c 2009-10-26 21:46:21 UTC (rev 15234)
+++ freeswitch/trunk/src/switch_core_io.c 2009-10-26 21:59:25 UTC (rev 15235)
</span><span class="lines">@@ -334,6 +334,10 @@
</span><span class="cx"> switch_bool_t ok = SWITCH_TRUE;
</span><span class="cx"> switch_thread_rwlock_rdlock(session->bug_rwlock);
</span><span class="cx"> for (bp = session->bugs; bp; bp = bp->next) {
</span><ins>+ if (!switch_channel_test_flag(session->channel, CF_ANSWERED) && switch_core_media_bug_test_flag(bp, SMBF_ANSWER_REQ)) {
+ continue;
+ }
+
</ins><span class="cx"> if (bp->ready && switch_test_flag(bp, SMBF_READ_STREAM)) {
</span><span class="cx"> switch_mutex_lock(bp->read_mutex);
</span><span class="cx"> switch_buffer_write(bp->raw_read_buffer, read_frame->data, read_frame->datalen);
</span><span class="lines">@@ -496,6 +500,10 @@
</span><span class="cx"> switch_bool_t ok = SWITCH_TRUE;
</span><span class="cx"> switch_thread_rwlock_rdlock(session->bug_rwlock);
</span><span class="cx"> for (bp = session->bugs; bp; bp = bp->next) {
</span><ins>+ if (!switch_channel_test_flag(session->channel, CF_ANSWERED) && switch_core_media_bug_test_flag(bp, SMBF_ANSWER_REQ)) {
+ continue;
+ }
+
</ins><span class="cx"> if (bp->ready && switch_test_flag(bp, SMBF_READ_PING)) {
</span><span class="cx"> switch_mutex_lock(bp->read_mutex);
</span><span class="cx"> if (bp->callback) {
</span><span class="lines">@@ -760,6 +768,11 @@
</span><span class="cx"> if (!bp->ready) {
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><ins>+
+ if (!switch_channel_test_flag(session->channel, CF_ANSWERED) && switch_core_media_bug_test_flag(bp, SMBF_ANSWER_REQ)) {
+ continue;
+ }
+
</ins><span class="cx"> if (switch_test_flag(bp, SMBF_WRITE_STREAM)) {
</span><span class="cx">
</span><span class="cx"> switch_mutex_lock(bp->write_mutex);
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_media_bugc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_media_bug.c (15234 => 15235)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_media_bug.c 2009-10-26 21:46:21 UTC (rev 15234)
+++ freeswitch/trunk/src/switch_core_media_bug.c 2009-10-26 21:59:25 UTC (rev 15235)
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> switch_size_t bytes;
</span><span class="cx"> switch_codec_implementation_t read_impl = {0};
</span><span class="cx"> switch_codec_implementation_t write_impl = {0};
</span><del>-
</del><ins>+ const char *p;
</ins><span class="cx">
</span><span class="cx"> if (!switch_channel_media_ready(session->channel)) {
</span><span class="cx"> if (switch_channel_pre_answer(session->channel) != SWITCH_STATUS_SUCCESS) {
</span><span class="lines">@@ -248,6 +248,11 @@
</span><span class="cx">
</span><span class="cx"> *new_bug = NULL;
</span><span class="cx">
</span><ins>+
+ if ((p = switch_channel_get_variable(session->channel, "media_bug_answer_req")) && switch_true(p)) {
+ flags |= SMBF_ANSWER_REQ;
+ }
+
</ins><span class="cx"> #if 0
</span><span class="cx"> if (flags & SMBF_WRITE_REPLACE) {
</span><span class="cx"> switch_thread_rwlock_wrlock(session->bug_rwlock);
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_asyncc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_async.c (15234 => 15235)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_async.c 2009-10-26 21:46:21 UTC (rev 15234)
+++ freeswitch/trunk/src/switch_ivr_async.c 2009-10-26 21:59:25 UTC (rev 15235)
</span><span class="lines">@@ -459,20 +459,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (rh->fh) {
</span><del>- if (switch_channel_test_flag(channel, CF_ANSWERED) || !switch_core_media_bug_test_flag(bug, SMBF_RECORD_ANSWER_REQ)) {
- switch_size_t len;
- uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE];
- switch_frame_t frame = { 0 };
</del><ins>+ switch_size_t len;
+ uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE];
+ switch_frame_t frame = { 0 };
</ins><span class="cx">
</span><ins>+ frame.data = data;
+ frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
</ins><span class="cx">
</span><del>- frame.data = data;
- frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
-
- while (switch_core_media_bug_read(bug, &frame, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS && !switch_test_flag((&frame), SFF_CNG)) {
- len = (switch_size_t) frame.datalen / 2;
- if (len) switch_core_file_write(rh->fh, data, &len);
- }
</del><ins>+ while (switch_core_media_bug_read(bug, &frame, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS && !switch_test_flag((&frame), SFF_CNG)) {
+ len = (switch_size_t) frame.datalen / 2;
+ if (len) switch_core_file_write(rh->fh, data, &len);
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx">
</span><span class="cx"> switch_core_file_close(rh->fh);
</span><span class="cx"> if (rh->fh->samples_out < read_impl.samples_per_second * 3) {
</span><span class="lines">@@ -493,12 +491,11 @@
</span><span class="cx"> frame.data = data;
</span><span class="cx"> frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
</span><span class="cx">
</span><del>- if (switch_channel_test_flag(channel, CF_ANSWERED) || !switch_core_media_bug_test_flag(bug, SMBF_RECORD_ANSWER_REQ)) {
- while (switch_core_media_bug_read(bug, &frame, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS && !switch_test_flag((&frame), SFF_CNG)) {
- len = (switch_size_t) frame.datalen / 2;
- if (len) switch_core_file_write(rh->fh, data, &len);
- }
</del><ins>+ while (switch_core_media_bug_read(bug, &frame, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS && !switch_test_flag((&frame), SFF_CNG)) {
+ len = (switch_size_t) frame.datalen / 2;
+ if (len) switch_core_file_write(rh->fh, data, &len);
</ins><span class="cx"> }
</span><ins>+
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case SWITCH_ABC_TYPE_WRITE:
</span><span class="lines">@@ -911,7 +908,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((p = switch_channel_get_variable(channel, "RECORD_ANSWER_REQ")) && switch_true(p)) {
</span><del>- flags |= SMBF_RECORD_ANSWER_REQ;
</del><ins>+ flags |= SMBF_ANSWER_REQ;
</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>