<!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][16867] </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=16867">16867</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2010-03-02 14:35:49 -0600 (Tue, 02 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>skypiax: works well again on Virtual Machines</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 (16866 => 16867)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2010-03-02 17:56:49 UTC (rev 16866)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2010-03-02 20:35:49 UTC (rev 16867)
</span><span class="lines">@@ -652,6 +652,7 @@
</span><span class="cx"> unsigned int i;
</span><span class="cx"> unsigned int a;
</span><span class="cx"> size_t bytes_read = 0;
</span><ins>+ int try=0;
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> channel = switch_core_session_get_channel(session);
</span><span class="lines">@@ -680,18 +681,34 @@
</span><span class="cx">
</span><span class="cx"> switch_core_timer_next(&tech_pvt->timer_read);
</span><span class="cx">
</span><del>- switch_mutex_lock(tech_pvt->mutex_audio_srv);
- if (switch_buffer_inuse(tech_pvt->read_buffer)) {
- bytes_read = switch_buffer_read(tech_pvt->read_buffer, tech_pvt->read_frame.data, 640);
- tech_pvt->read_frame.datalen = bytes_read;
- }
- switch_mutex_unlock(tech_pvt->mutex_audio_srv);
</del><ins>+read:
</ins><span class="cx">
</span><del>- if (!bytes_read) {
- //NOTICA("skypiax_audio_read Silence\n", SKYPIAX_P_LOG);
</del><ins>+
+ if (tech_pvt && tech_pvt->interface_state != SKYPIAX_STATE_DOWN
+ && (tech_pvt->skype_callflow == CALLFLOW_STATUS_INPROGRESS
+ || tech_pvt->skype_callflow == CALLFLOW_STATUS_EARLYMEDIA
+ || tech_pvt->skype_callflow == CALLFLOW_STATUS_REMOTEHOLD || tech_pvt->skype_callflow == SKYPIAX_STATE_UP)) {
+ switch_mutex_lock(tech_pvt->mutex_audio_srv);
+ if (switch_buffer_inuse(tech_pvt->read_buffer)) {
+ bytes_read = switch_buffer_read(tech_pvt->read_buffer, tech_pvt->read_frame.data, 640);
+ tech_pvt->read_frame.datalen = bytes_read;
+ }
+ switch_mutex_unlock(tech_pvt->mutex_audio_srv);
+
+ try=0;
+ if (!bytes_read) {
+ switch_sleep(1000);
+ try++;
+ if(try < 5)
+ goto read;
+ NOTICA("skypiax_audio_read Silence\n", SKYPIAX_P_LOG);
+ memset(tech_pvt->read_frame.data, 255, SAMPLES_PER_FRAME * sizeof(short));
+ tech_pvt->read_frame.datalen = 640;
+
+ }
+ } else {
</ins><span class="cx"> memset(tech_pvt->read_frame.data, 255, SAMPLES_PER_FRAME * sizeof(short));
</span><del>- tech_pvt->read_frame.datalen = SAMPLES_PER_FRAME * sizeof(short);
-
</del><ins>+ tech_pvt->read_frame.datalen = 640;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_set_flag(tech_pvt, TFLAG_VOICE);
</span><span class="lines">@@ -805,8 +822,9 @@
</span><span class="cx">
</span><span class="cx"> switch_mutex_lock(tech_pvt->mutex_audio_cli);
</span><span class="cx"> if (switch_buffer_freespace(tech_pvt->write_buffer) < frame->datalen) {
</span><del>- //WARNINGA("NO SPACE WRITE: %d\n", SKYPIAX_P_LOG, frame->datalen);
- switch_buffer_toss(tech_pvt->write_buffer, frame->datalen);
</del><ins>+ WARNINGA("NO SPACE WRITE: %d\n", SKYPIAX_P_LOG, frame->datalen);
+ //switch_buffer_toss(tech_pvt->write_buffer, frame->datalen);
+ switch_buffer_zero(tech_pvt->write_buffer);
</ins><span class="cx"> }
</span><span class="cx"> switch_buffer_write(tech_pvt->write_buffer, frame->data, frame->datalen);
</span><span class="cx"> switch_mutex_unlock(tech_pvt->mutex_audio_cli);
</span><span class="lines">@@ -1667,6 +1685,7 @@
</span><span class="cx"> #ifdef WIN32
</span><span class="cx"> if (SendMessage(tech_pvt->SkypiaxHandles.win32_hInit_MainWindowHandle, WM_DESTROY, 0, 0) == FALSE) { // let's the skypiax_api_thread_func die
</span><span class="cx"> DEBUGA_SKYPE("got FALSE here, thread probably was already dead. GetLastError returned: %d\n", SKYPIAX_P_LOG, GetLastError());
</span><ins>+ tech_pvt->skypiax_api_thread=NULL;
</ins><span class="cx"> }
</span><span class="cx"> #else
</span><span class="cx"> if (tech_pvt->SkypiaxHandles.disp) {
</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 (16866 => 16867)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2010-03-02 17:56:49 UTC (rev 16866)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2010-03-02 20:35:49 UTC (rev 16867)
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> sockbufsize = SAMPLES_PER_FRAME * 8;
</span><span class="cx"> #endif //WIN32
</span><span class="cx"> size = sizeof(int);
</span><del>- //setsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *) &sockbufsize, size);
</del><ins>+ setsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *) &sockbufsize, size);
</ins><span class="cx">
</span><span class="cx"> sockbufsize = 0;
</span><span class="cx"> size = sizeof(int);
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> sockbufsize = SAMPLES_PER_FRAME * 8;
</span><span class="cx"> #endif //WIN32
</span><span class="cx"> size = sizeof(int);
</span><del>- //setsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *) &sockbufsize, size);
</del><ins>+ setsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *) &sockbufsize, size);
</ins><span class="cx">
</span><span class="cx"> sockbufsize = 0;
</span><span class="cx"> size = sizeof(int);
</span><span class="lines">@@ -844,14 +844,14 @@
</span><span class="cx"> if (len > 0) {
</span><span class="cx"> switch_mutex_lock(tech_pvt->mutex_audio_srv);
</span><span class="cx"> if (switch_buffer_freespace(tech_pvt->read_buffer) < len) {
</span><del>- //switch_buffer_zero(tech_pvt->read_buffer);
</del><ins>+ switch_buffer_zero(tech_pvt->read_buffer);
</ins><span class="cx"> nospace = 1;
</span><del>- switch_buffer_toss(tech_pvt->read_buffer, len);
</del><ins>+ //switch_buffer_toss(tech_pvt->read_buffer, len);
</ins><span class="cx"> }
</span><span class="cx"> switch_buffer_write(tech_pvt->read_buffer, srv_in, len);
</span><span class="cx"> switch_mutex_unlock(tech_pvt->mutex_audio_srv);
</span><span class="cx"> if (nospace) {
</span><del>- //WARNINGA("NO SPACE READ: there was no space for: %d\n", SKYPIAX_P_LOG, len);
</del><ins>+ WARNINGA("NO SPACE READ: there was no space for: %d\n", SKYPIAX_P_LOG, len);
</ins><span class="cx"> }
</span><span class="cx"> } else if (len == 0) {
</span><span class="cx"> DEBUGA_SKYPE("CLOSED\n", SKYPIAX_P_LOG);
</span><span class="lines">@@ -992,6 +992,7 @@
</span><span class="cx"> switch_mutex_unlock(tech_pvt->mutex_audio_cli);
</span><span class="cx">
</span><span class="cx"> if (!bytes_to_write) {
</span><ins>+ continue;
</ins><span class="cx"> memset(cli_out, 255, sizeof(cli_out));
</span><span class="cx"> bytes_to_write = 640;
</span><span class="cx"> //NOTICA("WRITE Silence!\n", SKYPIAX_P_LOG);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>