<!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][14143] </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=14143">14143</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-07-06 17:21:45 -0500 (Mon, 06 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>change timing for media bug recording *yet again*</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_coreh">freeswitch/trunk/src/include/switch_core.h</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_media_bugc">freeswitch/trunk/src/switch_core_media_bug.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_sessionc">freeswitch/trunk/src/switch_core_session.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_coreh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_core.h (14142 => 14143)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_core.h 2009-07-06 22:04:09 UTC (rev 14142)
+++ freeswitch/trunk/src/include/switch_core.h 2009-07-06 22:21:45 UTC (rev 14143)
</span><span class="lines">@@ -156,6 +156,8 @@
</span><span class="cx"> */
</span><span class="cx"> SWITCH_DECLARE(void) switch_core_media_bug_resume(switch_core_session_t *session);
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(void) switch_core_media_bug_inuse(switch_media_bug_t *bug, switch_size_t *readp, switch_size_t *writep);
+
</ins><span class="cx"> /*!
</span><span class="cx"> \brief Obtain private data from a media bug
</span><span class="cx"> \param bug the bug to get the data from
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_media_bugc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_media_bug.c (14142 => 14143)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_media_bug.c 2009-07-06 22:04:09 UTC (rev 14142)
+++ freeswitch/trunk/src/switch_core_media_bug.c 2009-07-06 22:21:45 UTC (rev 14143)
</span><span class="lines">@@ -102,6 +102,25 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+SWITCH_DECLARE(void) switch_core_media_bug_inuse(switch_media_bug_t *bug, switch_size_t *readp, switch_size_t *writep)
+{
+ if (switch_test_flag(bug, SMBF_READ_STREAM)) {
+ switch_mutex_lock(bug->read_mutex);
+ *readp = bug->raw_read_buffer ? switch_buffer_inuse(bug->raw_read_buffer) : 0;
+ switch_mutex_unlock(bug->read_mutex);
+ } else {
+ *readp = 0;
+ }
+
+ if (switch_test_flag(bug, SMBF_WRITE_STREAM)) {
+ switch_mutex_lock(bug->write_mutex);
+ *writep = bug->raw_write_buffer ? switch_buffer_inuse(bug->raw_write_buffer) : 0;
+ switch_mutex_unlock(bug->write_mutex);
+ } else {
+ *writep = 0;
+ }
+}
+
</ins><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_core_media_bug_read(switch_media_bug_t *bug, switch_frame_t *frame, switch_bool_t fill)
</span><span class="cx"> {
</span><span class="cx"> switch_size_t bytes = 0, datalen = 0, ttl = 0;
</span><span class="lines">@@ -129,14 +148,14 @@
</span><span class="cx">
</span><span class="cx"> frame->flags = 0;
</span><span class="cx"> frame->datalen = 0;
</span><del>-
</del><ins>+
+ if (!switch_buffer_inuse(bug->raw_read_buffer)) {
+ return SWITCH_STATUS_FALSE;
+ }
+
</ins><span class="cx"> switch_mutex_lock(bug->read_mutex);
</span><span class="cx"> frame->datalen = (uint32_t) switch_buffer_read(bug->raw_read_buffer, frame->data, bytes);
</span><span class="cx"> ttl += frame->datalen;
</span><del>- if (fill && frame->datalen < bytes) {
- memset(((unsigned char *)frame->data) + frame->datalen, 0, bytes - frame->datalen);
- frame->datalen = bytes;
- }
</del><span class="cx"> switch_mutex_unlock(bug->read_mutex);
</span><span class="cx">
</span><span class="cx"> if (switch_test_flag(bug, SMBF_WRITE_STREAM)) {
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_sessionc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_session.c (14142 => 14143)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_session.c 2009-07-06 22:04:09 UTC (rev 14142)
+++ freeswitch/trunk/src/switch_core_session.c 2009-07-06 22:21:45 UTC (rev 14143)
</span><span class="lines">@@ -898,7 +898,6 @@
</span><span class="cx"> switch_clear_flag(session, SSF_WARN_TRANSCODE);
</span><span class="cx"> switch_ivr_deactivate_unicast(session);
</span><span class="cx"> switch_channel_clear_flag(channel, CF_BREAK);
</span><del>- switch_core_media_bug_flush_all(session);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_asyncc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_async.c (14142 => 14143)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_async.c 2009-07-06 22:04:09 UTC (rev 14142)
+++ freeswitch/trunk/src/switch_ivr_async.c 2009-07-06 22:21:45 UTC (rev 14143)
</span><span class="lines">@@ -420,11 +420,11 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#define LEAD_IN 25
</del><ins>+
</ins><span class="cx"> struct record_helper {
</span><span class="cx"> char *file;
</span><span class="cx"> switch_file_handle_t *fh;
</span><del>- int lead_in;
</del><ins>+ uint32_t packet_len;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> static switch_bool_t record_callback(switch_media_bug_t *bug, void *user_data, switch_abc_type_t type)
</span><span class="lines">@@ -449,18 +449,15 @@
</span><span class="cx"> switch_size_t len;
</span><span class="cx"> uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE];
</span><span class="cx"> switch_frame_t frame = { 0 };
</span><del>- int cnt = LEAD_IN;
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> frame.data = data;
</span><span class="cx"> frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
</span><span class="cx">
</span><del>- for (; cnt; cnt--) {
- if (switch_core_media_bug_read(bug, &frame, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) {
- len = (switch_size_t) frame.datalen / 2;
- 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><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_core_file_close(rh->fh);
</span><span class="lines">@@ -472,29 +469,22 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> break;
</span><del>- case SWITCH_ABC_TYPE_READ_PING:
- if (rh->lead_in) {
- rh->lead_in--;
- } else
-
</del><ins>+ case SWITCH_ABC_TYPE_READ:
+
</ins><span class="cx"> if (rh->fh) {
</span><span class="cx"> switch_size_t len;
</span><span class="cx"> uint8_t data[SWITCH_RECOMMENDED_BUFFER_SIZE];
</span><span class="cx"> switch_frame_t frame = { 0 };
</span><del>-
</del><ins>+
</ins><span class="cx"> frame.data = data;
</span><span class="cx"> frame.buflen = SWITCH_RECOMMENDED_BUFFER_SIZE;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (switch_channel_test_flag(channel, CF_ANSWERED) || !switch_core_media_bug_test_flag(bug, SMBF_RECORD_ANSWER_REQ)) {
</span><del>- while (switch_core_media_bug_read(bug, &frame, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS && frame.datalen) {
</del><ins>+ while (switch_core_media_bug_read(bug, &frame, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS && !switch_test_flag((&frame), SFF_CNG)) {
</ins><span class="cx"> len = (switch_size_t) frame.datalen / 2;
</span><del>- switch_core_file_write(rh->fh, data, &len);
- if (switch_test_flag((&frame), SFF_CNG)) {
- break;
- }
</del><ins>+ if (len) switch_core_file_write(rh->fh, data, &len);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><del>- rh->lead_in = LEAD_IN;
</del><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case SWITCH_ABC_TYPE_WRITE:
</span><span class="lines">@@ -890,7 +880,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> channels = read_impl.number_of_channels;
</span><del>-
</del><ins>+
</ins><span class="cx"> if ((bug = switch_channel_get_private(channel, file))) {
</span><span class="cx"> return switch_ivr_stop_record_session(session, file);
</span><span class="cx"> }
</span><span class="lines">@@ -905,7 +895,7 @@
</span><span class="cx"> flags |= SMBF_STEREO;
</span><span class="cx"> channels = 2;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> if ((p = switch_channel_get_variable(channel, "RECORD_ANSWER_REQ")) && switch_true(p)) {
</span><span class="cx"> flags |= SMBF_RECORD_ANSWER_REQ;
</span><span class="cx"> }
</span><span class="lines">@@ -968,9 +958,8 @@
</span><span class="cx"> rh = switch_core_session_alloc(session, sizeof(*rh));
</span><span class="cx"> rh->fh = fh;
</span><span class="cx"> rh->file = switch_core_session_strdup(session, file);
</span><del>- rh->lead_in = LEAD_IN;
</del><ins>+ rh->packet_len = read_impl.decoded_bytes_per_packet;
</ins><span class="cx">
</span><del>-
</del><span class="cx"> if ((vval = switch_channel_get_variable(channel, "record_sample_rate"))) {
</span><span class="cx"> int tmp = 0;
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>