<!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][16670] </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=16670">16670</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2010-02-16 20:20:17 -0600 (Tue, 16 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>skypiax: tentative timing on windoz, let's see if still works on linux</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxmod_skypiaxc">freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxskypiaxh">freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxskypiax_protocolc">freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxmod_skypiaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (16669 => 16670)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2010-02-17 02:04:04 UTC (rev 16669)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2010-02-17 02:20:17 UTC (rev 16670)
</span><span class="lines">@@ -688,6 +688,7 @@
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+tech_pvt->begin_to_read=1;
</ins><span class="cx"> tech_pvt->read_frame.flags = SFF_NONE;
</span><span class="cx"> *frame = NULL;
</span><span class="cx">
</span><span class="lines">@@ -1777,6 +1778,7 @@
</span><span class="cx"> switch_threadattr_t *thd_attr = NULL;
</span><span class="cx">
</span><span class="cx"> tech_pvt->begin_to_write=0;
</span><ins>+tech_pvt->begin_to_read=0;
</ins><span class="cx">
</span><span class="cx"> switch_threadattr_create(&thd_attr, skypiax_module_pool);
</span><span class="cx"> switch_threadattr_detach_set(thd_attr, 1);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxskypiaxh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h (16669 => 16670)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h 2010-02-17 02:04:04 UTC (rev 16669)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax.h 2010-02-17 02:20:17 UTC (rev 16670)
</span><span class="lines">@@ -279,6 +279,7 @@
</span><span class="cx"> switch_timer_t timer_read;
</span><span class="cx"> switch_timer_t timer_write;
</span><span class="cx"> int begin_to_write;
</span><ins>+int begin_to_read;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef struct private_object private_t;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxskypiax_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c (16669 => 16670)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2010-02-17 02:04:04 UTC (rev 16669)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2010-02-17 02:20:17 UTC (rev 16670)
</span><span class="lines">@@ -813,10 +813,15 @@
</span><span class="cx"> to.tv_usec = 60000; //60 msec
</span><span class="cx"> to.tv_sec = 0;
</span><span class="cx">
</span><ins>+if(tech_pvt->begin_to_read==0){
+skypiax_sleep(1000);
+continue;
+}
</ins><span class="cx"> if (tech_pvt->timer_read.timer_interface && tech_pvt->timer_read.timer_interface->timer_next) {
</span><span class="cx"> switch_core_timer_next(&tech_pvt->timer_read);
</span><span class="cx"> }
</span><del>- rt = select(fdselect + 1, &fs, NULL, NULL, &to);
</del><ins>+ //rt = select(fdselect + 1, &fs, NULL, NULL, &to);
+rt=1;
</ins><span class="cx"> if (rt > 0) {
</span><span class="cx">
</span><span class="cx"> if (tech_pvt->skype_callflow != CALLFLOW_STATUS_REMOTEHOLD) {
</span><span class="lines">@@ -889,6 +894,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } else if (len == 640) {
</span><ins>+#if 0
</ins><span class="cx"> int waitin;
</span><span class="cx"> int max_waitin=20;
</span><span class="cx">
</span><span class="lines">@@ -897,12 +903,15 @@
</span><span class="cx"> switch_sleep(1000); //1 millisec
</span><span class="cx"> waitin++;
</span><span class="cx"> if(waitin == max_waitin){
</span><ins>+ ERRORA("waitin is %d\n", SKYPIAX_P_LOG, waitin);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if(waitin > 1)
</del><ins>+ if(waitin > 10){
</ins><span class="cx"> ERRORA("waitin is %d\n", SKYPIAX_P_LOG, waitin);
</span><ins>+ }
+#endif//0
</ins><span class="cx"> switch_mutex_lock(tech_pvt->mutex_audio_srv);
</span><span class="cx"> memcpy(tech_pvt->audiobuf_srv, srv_in, SAMPLES_PER_FRAME * sizeof(short));
</span><span class="cx"> tech_pvt->flag_audio_srv = 1;
</span><span class="lines">@@ -1218,6 +1227,7 @@
</span><span class="cx"> {
</span><span class="cx"> unsigned int samples;
</span><span class="cx"> int waitin;
</span><ins>+ int max_waitin=20;
</ins><span class="cx">
</span><span class="cx"> waitin=0;
</span><span class="cx"> while (tech_pvt->flag_audio_srv == 0) {
</span><span class="lines">@@ -1228,10 +1238,14 @@
</span><span class="cx"> #endif //WIN32
</span><span class="cx"> waitin++;
</span><span class="cx">
</span><ins>+ if(waitin == max_waitin){
+ ERRORA("read is now %d\n", SKYPIAX_P_LOG, waitin);
+ break;
+ }
</ins><span class="cx"> //WARNINGA("read now is 0\n", SKYPIAX_P_LOG);
</span><span class="cx"> }
</span><del>- if(waitin > 21){
- ERRORA("read is now %d\n", SKYPIAX_P_LOG, waitin);
</del><ins>+ if(waitin > 10){
+ //ERRORA("read is now %d\n", SKYPIAX_P_LOG, waitin);
</ins><span class="cx"> }
</span><span class="cx"> //samples = skypiax_pipe_read(tech_pvt->audiopipe_srv[0], tech_pvt->read_frame.data, SAMPLES_PER_FRAME * sizeof(short));
</span><span class="cx"> switch_mutex_lock(tech_pvt->mutex_audio_srv);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>