<!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][15928] </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=15928">15928</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-12-11 18:04:07 -0600 (Fri, 11 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/FSCORE-510">FSCORE-510</a> part 12</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcswitch_rtpc">freeswitch/trunk/src/switch_rtp.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcswitch_rtpc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_rtp.c (15927 => 15928)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_rtp.c 2009-12-11 23:23:14 UTC (rev 15927)
+++ freeswitch/trunk/src/switch_rtp.c 2009-12-12 00:04:07 UTC (rev 15928)
</span><span class="lines">@@ -215,7 +215,6 @@
</span><span class="cx"> switch_rtp_stats_t stats;
</span><span class="cx"> uint32_t hot_hits;
</span><span class="cx"> uint32_t sync_packets;
</span><del>- uint32_t dtmf_wait;
</del><span class="cx">
</span><span class="cx"> #ifdef ENABLE_ZRTP
</span><span class="cx"> zrtp_session_t *zrtp_session;
</span><span class="lines">@@ -1605,7 +1604,6 @@
</span><span class="cx"> rtp_session->next_write_samplecount = rtp_session->timer.samplecount + samples * 5;
</span><span class="cx"> }
</span><span class="cx"> rtp_session->dtmf_data.out_digit_dur = 0;
</span><del>- rtp_session->dtmf_wait = rtp_session->samples_per_interval ? ((rtp_session->samples_per_second / 4) / rtp_session->samples_per_interval) : 12;
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1618,11 +1616,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (rtp_session->dtmf_wait) {
- rtp_session->dtmf_wait--;
- }
-
- if (!rtp_session->dtmf_wait && switch_queue_trypop(rtp_session->dtmf_data.dtmf_queue, &pop) == SWITCH_STATUS_SUCCESS) {
</del><ins>+ if (switch_queue_trypop(rtp_session->dtmf_data.dtmf_queue, &pop) == SWITCH_STATUS_SUCCESS) {
</ins><span class="cx"> switch_dtmf_t *rdigit = pop;
</span><span class="cx"> int64_t offset;
</span><span class="cx"> switch_size_t wrote;
</span><span class="lines">@@ -1824,6 +1818,7 @@
</span><span class="cx">
</span><span class="cx"> while (switch_rtp_ready(rtp_session)) {
</span><span class="cx"> int do_cng = 0;
</span><ins>+ bytes = 0;
</ins><span class="cx">
</span><span class="cx"> if (rtp_session->timer.interval) {
</span><span class="cx"> if ((switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOFLUSH) || switch_test_flag(rtp_session, SWITCH_RTP_FLAG_STICKY_FLUSH)) &&
</span><span class="lines">@@ -1857,6 +1852,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> recvfrom:
</span><ins>+ bytes = 0;
</ins><span class="cx">
</span><span class="cx"> if (!switch_rtp_ready(rtp_session)) {
</span><span class="cx"> break;
</span><span class="lines">@@ -1966,12 +1962,10 @@
</span><span class="cx"> if (bytes) {
</span><span class="cx"> if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_AUTOADJ)) {
</span><span class="cx"> if (((rtp_session->cng_pt && rtp_session->recv_msg.header.pt == rtp_session->cng_pt) || rtp_session->recv_msg.header.pt == 13)) {
</span><del>- bytes = 0;
</del><span class="cx"> goto recvfrom;
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> } else if (!switch_cmp_addr(rtp_session->from_addr, rtp_session->remote_addr)) {
</span><del>- bytes = 0;
</del><span class="cx"> goto recvfrom;
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -2274,8 +2268,7 @@
</span><span class="cx"> if (!switch_rtp_ready(rtp_session)) {
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><del>- switch_cond_next();
- goto recvfrom;
</del><ins>+ return_cng_frame();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> timer_check:
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>