<!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][16661] </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=16661">16661</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2010-02-16 14:21:57 -0600 (Tue, 16 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>skypiax: more timin fixes, works well on linux, with skype beta 2, 100HZ, and switch_ivr.c line 157 set to ms>1. Let's see on windoz</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_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 (16660 => 16661)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2010-02-16 17:34:32 UTC (rev 16660)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2010-02-16 20:21:57 UTC (rev 16661)
</span><span class="lines">@@ -845,15 +845,19 @@
</span><span class="cx"> switch_core_timer_sync(&tech_pvt->timer_write);
</span><span class="cx"> #endif // TIMER_WRITE
</span><span class="cx"> break;
</span><del>- default:
- {
</del><ins>+ case SWITCH_MESSAGE_INDICATE_BRIDGE:
</ins><span class="cx">
</span><del>- switch_core_timer_sync(&tech_pvt->timer_read);
</del><ins>+ DEBUGA_SKYPE("%s CHANNEL got SWITCH_MESSAGE_INDICATE_BRIDGE\n", SKYPIAX_P_LOG, switch_channel_get_name(channel));
+
+ switch_core_timer_sync(&tech_pvt->timer_read);
</ins><span class="cx"> #ifdef TIMER_WRITE
</span><del>-
- switch_core_timer_sync(&tech_pvt->timer_write);
</del><ins>+ switch_core_timer_sync(&tech_pvt->timer_write);
</ins><span class="cx"> #endif // TIMER_WRITE
</span><ins>+ break;
</ins><span class="cx">
</span><ins>+ default:
+ {
+
</ins><span class="cx"> DEBUGA_SKYPE("MSG_ID=%d\n", SKYPIAX_P_LOG, msg->message_id);
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="lines">@@ -987,7 +991,8 @@
</span><span class="cx"> switch_mutex_unlock(globals.mutex);
</span><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> }
</span><del>- switch_channel_set_variable(channel, "send_silence_when_idle", "true");
</del><ins>+ switch_channel_set_variable(channel, "send_silence_when_idle", "1500");
+ switch_channel_set_variable(channel, "waste", "false");
</ins><span class="cx"> if (skypiax_tech_init(tech_pvt, *new_session) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> ERRORA("Doh! no tech_init?\n", SKYPIAX_P_LOG);
</span><span class="cx"> switch_core_session_destroy(new_session);
</span><span class="lines">@@ -1809,7 +1814,8 @@
</span><span class="cx"> switch_core_session_destroy(&session);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><del>- switch_channel_set_variable(channel, "send_silence_when_idle", "true");
</del><ins>+ switch_channel_set_variable(channel, "send_silence_when_idle", "1500");
+ switch_channel_set_variable(channel, "waste", "false");
</ins><span class="cx"> if (skypiax_tech_init(tech_pvt, session) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> ERRORA("Doh! no tech_init?\n", SKYPIAX_P_LOG);
</span><span class="cx"> switch_core_session_destroy(&session);
</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 (16660 => 16661)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2010-02-16 17:34:32 UTC (rev 16660)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2010-02-16 20:21:57 UTC (rev 16661)
</span><span class="lines">@@ -828,7 +828,7 @@
</span><span class="cx"> if (len == 320) {
</span><span class="cx"> unsigned int howmany;
</span><span class="cx">
</span><del>- //DEBUGA_SKYPE("320!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n", SKYPIAX_P_LOG);
</del><ins>+ NOTICA("320!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n", SKYPIAX_P_LOG);
</ins><span class="cx"> if (samplerate_skypiax == 8000) {
</span><span class="cx"> /* we're downsampling from 16khz to 8khz, srv_out will contain each other sample from srv_in */
</span><span class="cx"> a = 0;
</span><span class="lines">@@ -889,14 +889,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } else if (len == 640) {
</span><ins>+ int waitin;
+ int max_waitin=20;
</ins><span class="cx">
</span><del>- if (tech_pvt->flag_audio_srv == 1) {
- switch_sleep(1000); //1 millisec
</del><ins>+ waitin=0;
+ while (tech_pvt->flag_audio_srv == 1) {
+ switch_sleep(1000); //1 millisec
+ waitin++;
+ if(waitin == max_waitin){
+ break;
</ins><span class="cx"> }
</span><del>- switch_mutex_lock(tech_pvt->mutex_audio_srv);
- memcpy(tech_pvt->audiobuf_srv, srv_in, SAMPLES_PER_FRAME * sizeof(short));
- tech_pvt->flag_audio_srv = 1;
- switch_mutex_unlock(tech_pvt->mutex_audio_srv);
</del><ins>+ }
+
+ if(waitin > 1)
+ ERRORA("waitin is %d\n", SKYPIAX_P_LOG, waitin);
+ switch_mutex_lock(tech_pvt->mutex_audio_srv);
+ memcpy(tech_pvt->audiobuf_srv, srv_in, SAMPLES_PER_FRAME * sizeof(short));
+ tech_pvt->flag_audio_srv = 1;
+ switch_mutex_unlock(tech_pvt->mutex_audio_srv);
</ins><span class="cx"> } else if (len == 0) {
</span><span class="cx"> skypiax_sleep(1000);
</span><span class="cx"> } else {
</span><span class="lines">@@ -1036,8 +1046,10 @@
</span><span class="cx"> fd_set fs;
</span><span class="cx"> struct timeval to;
</span><span class="cx"> int waitin;
</span><del>- //int big_waitin=40;
- //int lil_waitin=20;
</del><ins>+#if 1
+ int big_waitin=40;
+ int lil_waitin=20;
+#endif//0
</ins><span class="cx"> int big_waited;
</span><span class="cx">
</span><span class="cx"> if (!(running && tech_pvt->running))
</span><span class="lines">@@ -1071,7 +1083,7 @@
</span><span class="cx"> skypiax_sleep(1000); //1 millisec
</span><span class="cx"> #endif //WIN32
</span><span class="cx"> waitin++;
</span><del>-#if 0
</del><ins>+#if 1
</ins><span class="cx"> if(big_waited == 1 && waitin==lil_waitin && tech_pvt->flag_audio_cli == 0){
</span><span class="cx"> memset(cli_out, 255, SAMPLES_PER_FRAME * sizeof(short));
</span><span class="cx"> send(fd, (char *) cli_out, SAMPLES_PER_FRAME * sizeof(short), 0);
</span><span class="lines">@@ -1091,7 +1103,7 @@
</span><span class="cx"> #endif //0
</span><span class="cx"> }
</span><span class="cx"> if(waitin > 21){
</span><del>- //NOTICA("waitin is now %d\n", SKYPIAX_P_LOG, waitin);
</del><ins>+ NOTICA("waitin is now %d\n", SKYPIAX_P_LOG, waitin);
</ins><span class="cx"> }
</span><span class="cx"> rt = 1;
</span><span class="cx">
</span><span class="lines">@@ -1205,7 +1217,7 @@
</span><span class="cx"> //WARNINGA("read now is 0\n", SKYPIAX_P_LOG);
</span><span class="cx"> }
</span><span class="cx"> if(waitin > 21){
</span><del>- //DEBUGA_SKYPE("read is now %d\n", SKYPIAX_P_LOG, waitin);
</del><ins>+ 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>