<!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][15395] </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=15395">15395</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-11-06 17:29:36 -0600 (Fri, 06 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix some sample count issues</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_voicemailmod_voicemailc">freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_filec">freeswitch/trunk/src/switch_core_file.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivr_asyncc">freeswitch/trunk/src/switch_ivr_async.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="freeswitchtrunksrcmodapplicationsmod_voicemailmod_voicemailc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (15394 => 15395)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 2009-11-06 23:19:15 UTC (rev 15394)
+++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c 2009-11-06 23:29:36 UTC (rev 15395)
</span><span class="lines">@@ -1158,7 +1158,7 @@
</span><span class="cx"> got_file = 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (limit && (*message_len = fh.sample_count / read_impl.actual_samples_per_second) < profile->min_record_len) {
</del><ins>+ if (limit && (*message_len = fh.samples_out / fh.samplerate) < profile->min_record_len) {
</ins><span class="cx"> if (unlink(file_path) != 0) {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Failed to delete file [%s]\n", file_path);
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_filec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_file.c (15394 => 15395)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_file.c 2009-11-06 23:19:15 UTC (rev 15394)
+++ freeswitch/trunk/src/switch_core_file.c 2009-11-06 23:29:36 UTC (rev 15395)
</span><span class="lines">@@ -323,6 +323,7 @@
</span><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_core_file_write(switch_file_handle_t *fh, void *data, switch_size_t *len)
</span><span class="cx"> {
</span><span class="cx"> switch_size_t orig_len = *len;
</span><span class="lines">@@ -374,7 +375,6 @@
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> if (fh->pre_buffer) {
</span><span class="cx"> switch_size_t rlen, blen;
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -383,6 +383,7 @@
</span><span class="cx"> switch_buffer_write(fh->pre_buffer, data, (asis ? *len : *len * 2) * fh->channels);
</span><span class="cx">
</span><span class="cx"> rlen = switch_buffer_inuse(fh->pre_buffer);
</span><ins>+
</ins><span class="cx"> if (rlen >= fh->pre_buffer_datalen) {
</span><span class="cx"> if ((blen = switch_buffer_read(fh->pre_buffer, fh->pre_buffer_data, fh->pre_buffer_datalen))) {
</span><span class="cx"> if (!asis) blen /= 2;
</span><span class="lines">@@ -398,7 +399,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> switch_status_t status;
</span><span class="cx"> if ((status = fh->file_interface->file_write(fh, data, len)) == SWITCH_STATUS_SUCCESS) {
</span><del>- fh->samples_out += *len;
</del><ins>+ fh->samples_out += orig_len;
</ins><span class="cx"> }
</span><span class="cx"> return status;
</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 (15394 => 15395)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_async.c 2009-11-06 23:19:15 UTC (rev 15394)
+++ freeswitch/trunk/src/switch_ivr_async.c 2009-11-06 23:29:36 UTC (rev 15395)
</span><span class="lines">@@ -474,7 +474,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> switch_core_file_close(rh->fh);
</span><del>- if (rh->fh->samples_out < read_impl.samples_per_second * rh->min_sec) {
</del><ins>+ if (rh->fh->samples_out < rh->fh->samplerate * rh->min_sec) {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Discarding short file %s\n", rh->file);
</span><span class="cx"> switch_file_remove(rh->file, switch_core_session_get_pool(session));
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_play_sayc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_play_say.c (15394 => 15395)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_play_say.c 2009-11-06 23:19:15 UTC (rev 15394)
+++ freeswitch/trunk/src/switch_ivr_play_say.c 2009-11-06 23:29:36 UTC (rev 15395)
</span><span class="lines">@@ -397,9 +397,15 @@
</span><span class="cx"> switch_frame_t write_frame = { 0 };
</span><span class="cx"> unsigned char write_buf[SWITCH_RECOMMENDED_BUFFER_SIZE] = { 0 };
</span><span class="cx"> switch_event_t *event;
</span><ins>+ int divisor = 0;
</ins><span class="cx">
</span><span class="cx"> switch_core_session_get_read_impl(session, &read_impl);
</span><span class="cx">
</span><ins>+ if (!(divisor = read_impl.actual_samples_per_second / 8000)) {
+ divisor = 1;
+ }
+
+
</ins><span class="cx"> if (!switch_channel_ready(channel)) {
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="lines">@@ -663,18 +669,15 @@
</span><span class="cx"> uint32_t samples = read_frame->datalen / sizeof(*fdata);
</span><span class="cx"> uint32_t score, count = 0, j = 0;
</span><span class="cx"> double energy = 0;
</span><del>- int divisor = 0;
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> for (count = 0; count < samples; count++) {
</span><span class="cx"> energy += abs(fdata[j]);
</span><span class="cx"> j += read_impl.number_of_channels;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (!(divisor = read_impl.actual_samples_per_second / 8000)) {
- divisor = 1;
- }
</del><ins>+ score = (uint32_t) (energy / (samples / divisor));
</ins><span class="cx">
</span><del>- score = (uint32_t) (energy / (samples / divisor));
</del><span class="cx"> if (score < fh->thresh) {
</span><span class="cx"> if (!--fh->silence_hits) {
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>