<!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][16851] </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=16851">16851</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2010-03-01 07:25:04 -0600 (Mon, 01 Mar 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>skypiax: Synching audio</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 (16850 => 16851)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2010-03-01 11:06:47 UTC (rev 16850)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c 2010-03-01 13:25:04 UTC (rev 16851)
</span><span class="lines">@@ -847,22 +847,63 @@
</span><span class="cx"> switch (msg->message_id) {
</span><span class="cx"> case SWITCH_MESSAGE_INDICATE_ANSWER:
</span><span class="cx"> {
</span><del>- DEBUGA_SKYPE("MSG_ID=%d, TO BE ANSWERED!\n", SKYPIAX_P_LOG, msg->message_id);
- switch_core_timer_sync(&tech_pvt->timer_read);
- switch_core_timer_sync(&tech_pvt->timer_write);
</del><ins>+ DEBUGA_SKYPE("%s CHANNEL got SWITCH_MESSAGE_INDICATE_ANSWER\n", SKYPIAX_P_LOG, switch_channel_get_name(channel));
+
</ins><span class="cx"> channel_answer_channel(session);
</span><ins>+
+ if(tech_pvt->read_buffer){
+ switch_mutex_lock(tech_pvt->mutex_audio_srv);
+ switch_buffer_zero(tech_pvt->read_buffer);
+ switch_core_timer_sync(&tech_pvt->timer_read);
+ switch_mutex_unlock(tech_pvt->mutex_audio_srv);
+ }
+
+ if(tech_pvt->write_buffer){
+ switch_mutex_lock(tech_pvt->mutex_audio_cli);
+ switch_buffer_zero(tech_pvt->write_buffer);
+ switch_core_timer_sync(&tech_pvt->timer_write);
+ switch_mutex_unlock(tech_pvt->mutex_audio_cli);
+ }
+ DEBUGA_SKYPE("Synching audio\n", SKYPIAX_P_LOG);
+
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case SWITCH_MESSAGE_INDICATE_AUDIO_SYNC:
</span><span class="cx">
</span><span class="cx"> DEBUGA_SKYPE("%s CHANNEL got SWITCH_MESSAGE_INDICATE_AUDIO_SYNC\n", SKYPIAX_P_LOG, switch_channel_get_name(channel));
</span><del>- switch_core_timer_sync(&tech_pvt->timer_read);
- switch_core_timer_sync(&tech_pvt->timer_write);
</del><ins>+
+ if(tech_pvt->read_buffer){
+ switch_mutex_lock(tech_pvt->mutex_audio_srv);
+ switch_buffer_zero(tech_pvt->read_buffer);
+ switch_core_timer_sync(&tech_pvt->timer_read);
+ switch_mutex_unlock(tech_pvt->mutex_audio_srv);
+ }
+
+ if(tech_pvt->write_buffer){
+ switch_mutex_lock(tech_pvt->mutex_audio_cli);
+ switch_buffer_zero(tech_pvt->write_buffer);
+ switch_core_timer_sync(&tech_pvt->timer_write);
+ switch_mutex_unlock(tech_pvt->mutex_audio_cli);
+ }
+ DEBUGA_SKYPE("Synching audio\n", SKYPIAX_P_LOG);
</ins><span class="cx"> break;
</span><span class="cx"> case SWITCH_MESSAGE_INDICATE_BRIDGE:
</span><span class="cx"> DEBUGA_SKYPE("%s CHANNEL got SWITCH_MESSAGE_INDICATE_BRIDGE\n", SKYPIAX_P_LOG, switch_channel_get_name(channel));
</span><del>- switch_core_timer_sync(&tech_pvt->timer_read);
- switch_core_timer_sync(&tech_pvt->timer_write);
</del><ins>+
+ if(tech_pvt->read_buffer){
+ switch_mutex_lock(tech_pvt->mutex_audio_srv);
+ switch_buffer_zero(tech_pvt->read_buffer);
+ switch_core_timer_sync(&tech_pvt->timer_read);
+ switch_mutex_unlock(tech_pvt->mutex_audio_srv);
+ }
+
+ if(tech_pvt->write_buffer){
+ switch_mutex_lock(tech_pvt->mutex_audio_cli);
+ switch_buffer_zero(tech_pvt->write_buffer);
+ switch_core_timer_sync(&tech_pvt->timer_write);
+ switch_mutex_unlock(tech_pvt->mutex_audio_cli);
+ }
+ DEBUGA_SKYPE("Synching audio\n", SKYPIAX_P_LOG);
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> default:
</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 (16850 => 16851)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2010-03-01 11:06:47 UTC (rev 16850)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c 2010-03-01 13:25:04 UTC (rev 16851)
</span><span class="lines">@@ -501,11 +501,22 @@
</span><span class="cx"> if (!strcasecmp(prop, "FAILUREREASON")) {
</span><span class="cx"> DEBUGA_SKYPE("Skype FAILED on skype_call %s. Let's wait for the FAILED message.\n", SKYPIAX_P_LOG, id);
</span><span class="cx"> }
</span><del>- if (!strcasecmp(prop, "DURATION")) { /* each 20 seconds, we sync ithe timers */
</del><ins>+ if (!strcasecmp(prop, "DURATION")) { /* each 20 seconds, we zero the buffers and sync the timers */
</ins><span class="cx"> if (!((atoi(value) % 20))) {
</span><del>- switch_core_timer_sync(&tech_pvt->timer_read);
- switch_core_timer_sync(&tech_pvt->timer_write);
- DEBUGA_SKYPE("Synching on skype_call: %s.\n", SKYPIAX_P_LOG, id);
</del><ins>+ if(tech_pvt->read_buffer){
+ switch_mutex_lock(tech_pvt->mutex_audio_srv);
+ switch_buffer_zero(tech_pvt->read_buffer);
+ switch_core_timer_sync(&tech_pvt->timer_read);
+ switch_mutex_unlock(tech_pvt->mutex_audio_srv);
+ }
+
+ if(tech_pvt->write_buffer){
+ switch_mutex_lock(tech_pvt->mutex_audio_cli);
+ switch_buffer_zero(tech_pvt->write_buffer);
+ switch_core_timer_sync(&tech_pvt->timer_write);
+ switch_mutex_unlock(tech_pvt->mutex_audio_cli);
+ }
+ DEBUGA_SKYPE("Synching audio on skype_call: %s.\n", SKYPIAX_P_LOG, id);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if (!strcasecmp(prop, "DURATION") && (!strcasecmp(value, "1"))) {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>