<!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][16638] </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=16638">16638</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2010-02-13 20:36:46 -0600 (Sat, 13 Feb 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>skypiax: lot of changes and tweakings about timing</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxalsadummyc">freeswitch/trunk/src/mod/endpoints/mod_skypiax/alsa/dummy.c</a></li>
<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>

<h3>Added Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxconfigscopy">freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/copy</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_skypiaxconfigscreate">freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/create</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxalsadummyc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/alsa/dummy.c (16637 => 16638)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/alsa/dummy.c        2010-02-14 00:45:47 UTC (rev 16637)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/alsa/dummy.c        2010-02-14 02:36:46 UTC (rev 16638)
</span><span class="lines">@@ -336,8 +336,8 @@
</span><span class="cx">                         printk(&quot;giova: timer_func %d %d NULL: continue\n&quot;, __LINE__, i);
</span><span class="cx">                         continue;
</span><span class="cx">                 }
</span><del>-                if (in_irq())
-                        printk(&quot;giova: timer_func %d %d we are in HARDWARE IRQ\n&quot;, __LINE__, i);
</del><ins>+                //if (in_irq())
+                        //printk(&quot;giova: timer_func %d %d we are in HARDWARE IRQ\n&quot;, __LINE__, i);
</ins><span class="cx">                 //if(in_softirq())
</span><span class="cx">                 //printk(&quot;giova: timer_func %d %d we are in SOFT IRQ\n&quot;, __LINE__, i);
</span><span class="cx"> //printk(&quot;giova: timer_func %d %d\n&quot;, __LINE__, i);
</span><span class="lines">@@ -364,8 +364,8 @@
</span><span class="cx">         struct snd_dummy_pcm *dpcm = runtime-&gt;private_data;
</span><span class="cx"> 
</span><span class="cx"> //printk(&quot;giova: pointer %d %p\n&quot;, __LINE__, dpcm);
</span><del>-        //return bytes_to_frames(runtime, dpcm-&gt;pcm_buf_pos / dpcm-&gt;pcm_hz);
-        return (dpcm-&gt;pcm_buf_pos / dpcm-&gt;pcm_hz) / 2;
</del><ins>+        return bytes_to_frames(runtime, dpcm-&gt;pcm_buf_pos / dpcm-&gt;pcm_hz);
+        //return (dpcm-&gt;pcm_buf_pos / dpcm-&gt;pcm_hz) / 2;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static struct snd_pcm_hardware snd_card_dummy_playback = {
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxconfigscopy"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/copy (0 => 16638)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/copy                                (rev 0)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/copy        2010-02-14 02:36:46 UTC (rev 16638)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+cp -a skypiax101/* skypiax102/
+cp -a skypiax101/* skypiax103/
+cp -a skypiax101/* skypiax104/
+cp -a skypiax101/* skypiax105/
+cp -a skypiax101/* skypiax106/
+cp -a skypiax101/* skypiax107/
+cp -a skypiax101/* skypiax108/
+cp -a skypiax101/* skypiax109/
+cp -a skypiax101/* skypiax110/
+cp -a skypiax101/* skypiax111/
+cp -a skypiax101/* skypiax112/
+cp -a skypiax101/* skypiax113/
+cp -a skypiax101/* skypiax114/
+cp -a skypiax101/* skypiax115/
+cp -a skypiax101/* skypiax116/
+cp -a skypiax101/* skypiax117/
+cp -a skypiax101/* skypiax118/
+cp -a skypiax101/* skypiax119/
+cp -a skypiax101/* skypiax120/
+cp -a skypiax101/* skypiax121/
+cp -a skypiax101/* skypiax122/
+cp -a skypiax101/* skypiax123/
+cp -a skypiax101/* skypiax124/
+cp -a skypiax101/* skypiax125/
+cp -a skypiax101/* skypiax126/
+cp -a skypiax101/* skypiax127/
+cp -a skypiax101/* skypiax128/
+cp -a skypiax101/* skypiax129/
+cp -a skypiax101/* skypiax130/
+cp -a skypiax101/* skypiax131/
+cp -a skypiax101/* skypiax132/
+cp -a skypiax101/* skypiax133/
+cp -a skypiax101/* skypiax134/
+cp -a skypiax101/* skypiax135/
+cp -a skypiax101/* skypiax136/
+cp -a skypiax101/* skypiax137/
+cp -a skypiax101/* skypiax138/
+cp -a skypiax101/* skypiax139/
+cp -a skypiax101/* skypiax140/
</ins></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxconfigscreate"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/create (0 => 16638)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/create                                (rev 0)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/configs/create        2010-02-14 02:36:46 UTC (rev 16638)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+mkdir skypiax101
+mkdir skypiax102
+mkdir skypiax103
+mkdir skypiax104
+mkdir skypiax105
+mkdir skypiax106
+mkdir skypiax107
+mkdir skypiax108
+mkdir skypiax109
+mkdir skypiax110
+mkdir skypiax111
+mkdir skypiax112
+mkdir skypiax113
+mkdir skypiax114
+mkdir skypiax115
+mkdir skypiax116
+mkdir skypiax117
+mkdir skypiax118
+mkdir skypiax119
+mkdir skypiax120
+mkdir skypiax121
+mkdir skypiax122
+mkdir skypiax123
+mkdir skypiax124
+mkdir skypiax125
+mkdir skypiax126
+mkdir skypiax127
+mkdir skypiax128
+mkdir skypiax129
+mkdir skypiax130
+mkdir skypiax131
+mkdir skypiax132
+mkdir skypiax133
+mkdir skypiax134
+mkdir skypiax135
+mkdir skypiax136
+mkdir skypiax137
+mkdir skypiax138
+mkdir skypiax139
+mkdir skypiax140
</ins></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_skypiaxmod_skypiaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c (16637 => 16638)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c        2010-02-14 00:45:47 UTC (rev 16637)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/mod_skypiax.c        2010-02-14 02:36:46 UTC (rev 16638)
</span><span class="lines">@@ -719,7 +719,6 @@
</span><span class="cx">                                 DEBUGA_SKYPE(&quot;CHANNEL READ CONTINUE\n&quot;, SKYPIAX_P_LOG);
</span><span class="cx">                                 continue;
</span><span class="cx">                         }
</span><del>-                        switch_core_timer_check(&amp;tech_pvt-&gt;timer_read, SWITCH_TRUE);
</del><span class="cx">                         *frame = &amp;tech_pvt-&gt;read_frame;
</span><span class="cx"> #if SWITCH_BYTE_ORDER == __BIG_ENDIAN
</span><span class="cx">                         if (switch_test_flag(tech_pvt, TFLAG_LINEAR)) {
</span><span class="lines">@@ -1393,6 +1392,7 @@
</span><span class="cx">                                 switch_sleep(100000);
</span><span class="cx"> 
</span><span class="cx">                                 skypiax_audio_init(&amp;globals.SKYPIAX_INTERFACES[interface_id]);
</span><ins>+                                switch_mutex_init(&amp;globals.SKYPIAX_INTERFACES[interface_id].mutex_audio_srv, SWITCH_MUTEX_NESTED, skypiax_module_pool);
</ins><span class="cx"> 
</span><span class="cx">                                 NOTICA
</span><span class="cx">                                         (&quot;WAITING roughly 10 seconds to find a running Skype client and connect to its SKYPE API for interface_id=%d\n&quot;,
</span><span class="lines">@@ -1740,7 +1740,7 @@
</span><span class="cx"> 
</span><span class="cx">         if (channel) {
</span><span class="cx"> 
</span><del>-                if (!switch_channel_test_flag(channel, CF_BRIDGED)) {
</del><ins>+                //if (!switch_channel_test_flag(channel, CF_BRIDGED)) {
</ins><span class="cx"> 
</span><span class="cx">                         switch_dtmf_t dtmf = { (char) value[0], switch_core_default_dtmf_duration(0) };
</span><span class="cx">                         DEBUGA_SKYPE(&quot;received DTMF %c on channel %s\n&quot;, SKYPIAX_P_LOG, dtmf.digit, switch_channel_get_name(channel));
</span><span class="lines">@@ -1749,10 +1749,10 @@
</span><span class="cx">                         switch_channel_queue_dtmf(channel, &amp;dtmf);
</span><span class="cx">                         switch_set_flag(tech_pvt, TFLAG_DTMF);
</span><span class="cx">                         switch_mutex_unlock(tech_pvt-&gt;flag_mutex);
</span><del>-                } else {
-                        NOTICA
-                                (&quot;received a DTMF on channel %s, but we're BRIDGED, so let's NOT relay it out of band\n&quot;, SKYPIAX_P_LOG, switch_channel_get_name(channel));
-                }
</del><ins>+                //} else {
+                        //NOTICA
+                                //(&quot;received a DTMF on channel %s, but we're BRIDGED, so let's NOT relay it out of band\n&quot;, SKYPIAX_P_LOG, switch_channel_get_name(channel));
+                //}
</ins><span class="cx">         } else {
</span><span class="cx">                 WARNINGA(&quot;received %c DTMF, but no channel?\n&quot;, SKYPIAX_P_LOG, value[0]);
</span><span class="cx">         }
</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 (16637 => 16638)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c        2010-02-14 00:45:47 UTC (rev 16637)
+++ freeswitch/trunk/src/mod/endpoints/mod_skypiax/skypiax_protocol.c        2010-02-14 02:36:46 UTC (rev 16638)
</span><span class="lines">@@ -813,11 +813,14 @@
</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-&gt;timer_read.timer_interface &amp;&amp; tech_pvt-&gt;timer_read.timer_interface-&gt;timer_next) {
+        switch_core_timer_next(&amp;tech_pvt-&gt;timer_read);
+                                         }
</ins><span class="cx">                                         rt = select(fdselect + 1, &amp;fs, NULL, NULL, &amp;to);
</span><span class="cx">                                         if (rt &gt; 0) {
</span><span class="cx"> 
</span><span class="cx">                                                 if (tech_pvt-&gt;skype_callflow != CALLFLOW_STATUS_REMOTEHOLD) {
</span><del>-                                                        len = recv(fd, (char *) srv_in, 320, 0);        //seems that Skype only sends 320 bytes at time
</del><ins>+                                                        len = recv(fd, (char *) srv_in, 640, 0);        //seems that Skype only sends 320 bytes at time
</ins><span class="cx">                                                 } else {
</span><span class="cx">                                                         len = 0;
</span><span class="cx">                                                 }
</span><span class="lines">@@ -825,6 +828,7 @@
</span><span class="cx">                                                 if (len == 320) {
</span><span class="cx">                                                         unsigned int howmany;
</span><span class="cx"> 
</span><ins>+                                                                //DEBUGA_SKYPE(&quot;320!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n&quot;, 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">@@ -869,10 +873,12 @@
</span><span class="cx">                                                                 if (tech_pvt-&gt;flag_audio_srv == 1) {
</span><span class="cx">                                                                         switch_sleep(1000);        //1 millisec
</span><span class="cx">                                                                 }
</span><del>-                                                                if (tech_pvt-&gt;flag_audio_srv == 0) {
</del><ins>+                                                                //if (tech_pvt-&gt;flag_audio_srv == 0) {
+                        switch_mutex_lock(tech_pvt-&gt;mutex_audio_srv);
</ins><span class="cx">                                                                         memcpy(tech_pvt-&gt;audiobuf_srv, totalbuf, SAMPLES_PER_FRAME * sizeof(short));
</span><span class="cx">                                                                         tech_pvt-&gt;flag_audio_srv = 1;
</span><del>-                                                                }
</del><ins>+                        switch_mutex_unlock(tech_pvt-&gt;mutex_audio_srv);
+                                                                //}
</ins><span class="cx">                                                                 //NOTICA(&quot;read \n&quot;, SKYPIAX_P_LOG);
</span><span class="cx">                                                                 if (howmany != SAMPLES_PER_FRAME * sizeof(short)) {
</span><span class="cx">                                                                         ERRORA(&quot;howmany is %d, but was expected to be %d\n&quot;, SKYPIAX_P_LOG,
</span><span class="lines">@@ -882,10 +888,19 @@
</span><span class="cx">                                                                 tech_pvt-&gt;audiobuf_is_loaded = 0;
</span><span class="cx">                                                         }
</span><span class="cx"> 
</span><ins>+                                                } else if (len == 640) {
+
+                                                                if (tech_pvt-&gt;flag_audio_srv == 1) {
+                                                                        switch_sleep(1000);        //1 millisec
+                                                                }
+                        switch_mutex_lock(tech_pvt-&gt;mutex_audio_srv);
+                                                                        memcpy(tech_pvt-&gt;audiobuf_srv, srv_in, SAMPLES_PER_FRAME * sizeof(short));
+                                                                        tech_pvt-&gt;flag_audio_srv = 1;
+                        switch_mutex_unlock(tech_pvt-&gt;mutex_audio_srv);
</ins><span class="cx">                                                 } else if (len == 0) {
</span><span class="cx">                                                         skypiax_sleep(1000);
</span><span class="cx">                                                 } else {
</span><del>-                                                        DEBUGA_SKYPE(&quot;len=%d, expected 320\n&quot;, SKYPIAX_P_LOG, len);
</del><ins>+                                                        ERRORA(&quot;len=%d, expected 640\n&quot;, SKYPIAX_P_LOG, len);
</ins><span class="cx">                                                 }
</span><span class="cx"> 
</span><span class="cx">                                         } else {
</span><span class="lines">@@ -1017,6 +1032,10 @@
</span><span class="cx">                                         int rt;
</span><span class="cx">                                         fd_set fs;
</span><span class="cx">                                         struct timeval to;
</span><ins>+                                        int waitin;
+                                        int big_waitin=40;
+                                        int lil_waitin=20;
+                                        int big_waited;
</ins><span class="cx"> 
</span><span class="cx">                                         if (!(running &amp;&amp; tech_pvt-&gt;running))
</span><span class="cx">                                                 break;
</span><span class="lines">@@ -1040,15 +1059,36 @@
</span><span class="cx">                                         FD_SET(fdselect, &amp;fs);
</span><span class="cx"> 
</span><span class="cx">                                         //FIXME rt = select(fdselect + 1, NULL, &amp;fs, NULL, &amp;to);
</span><ins>+                                        waitin=0;
+                                        big_waited=0;
</ins><span class="cx">                                         while (tech_pvt-&gt;flag_audio_cli == 0) {
</span><span class="cx"> #ifdef WIN32
</span><span class="cx">                                                 skypiax_sleep(100);        //0.1 millisec
</span><span class="cx"> #else
</span><span class="cx">                                                 skypiax_sleep(1000);        //1 millisec
</span><span class="cx"> #endif //WIN32
</span><del>-                                                //WARNINGA(&quot;write now is 0\n&quot;, SKYPIAX_P_LOG);
</del><ins>+                                                waitin++;
+                                                if(big_waited == 1 &amp;&amp; waitin==lil_waitin &amp;&amp; tech_pvt-&gt;flag_audio_cli == 0){
+                                                        memset(cli_out, 255, SAMPLES_PER_FRAME * sizeof(short));
+                                                        send(fd, (char *) cli_out, SAMPLES_PER_FRAME * sizeof(short), 0);
+                                                        //WARNINGA(&quot;write buffer filled at %d\n&quot;, SKYPIAX_P_LOG, waitin);
+                                                        waitin=0;
+                                                        continue;
+                                                }
+                                                if(big_waited == 0 &amp;&amp; waitin==big_waitin &amp;&amp; tech_pvt-&gt;flag_audio_cli == 0){
+                                                        memset(cli_out, 255, SAMPLES_PER_FRAME * sizeof(short));
+                                                        send(fd, (char *) cli_out, SAMPLES_PER_FRAME * sizeof(short), 0);
+                                                        send(fd, (char *) cli_out, SAMPLES_PER_FRAME * sizeof(short), 0);
+                                                        //DEBUGA_SKYPE(&quot;write buffer filled at %d\n&quot;, SKYPIAX_P_LOG, waitin);
+                                                        waitin=0;
+                                                        big_waited=1;
+                                                        continue;
+                                                }
+
</ins><span class="cx">                                         }
</span><del>-                                        //ERRORA(&quot;write is now 1\n&quot;, SKYPIAX_P_LOG);
</del><ins>+                                        if(waitin &gt; 21){
+                                                //DEBUGA_SKYPE(&quot;waitin is now %d\n&quot;, SKYPIAX_P_LOG, waitin);
+                                        }
</ins><span class="cx"> 
</span><span class="cx">                                         rt = 1;
</span><span class="cx"> 
</span><span class="lines">@@ -1149,22 +1189,29 @@
</span><span class="cx"> int skypiax_audio_read(private_t * tech_pvt)
</span><span class="cx"> {
</span><span class="cx">         unsigned int samples;
</span><ins>+        int waitin;
</ins><span class="cx"> 
</span><ins>+        waitin=0;
</ins><span class="cx">         while (tech_pvt-&gt;flag_audio_srv == 0) {
</span><span class="cx"> #ifdef WIN32
</span><span class="cx">                 skypiax_sleep(100);                //0.1 millisec
</span><span class="cx"> #else
</span><span class="cx">                 skypiax_sleep(1000);        //1 millisec
</span><span class="cx"> #endif //WIN32
</span><ins>+                waitin++;
</ins><span class="cx"> 
</span><span class="cx">                 //WARNINGA(&quot;read now is 0\n&quot;, SKYPIAX_P_LOG);
</span><span class="cx">         }
</span><del>-        //ERRORA(&quot;read is now 1\n&quot;, SKYPIAX_P_LOG);
</del><ins>+        if(waitin &gt; 21){
+                //DEBUGA_SKYPE(&quot;read is now %d\n&quot;, SKYPIAX_P_LOG, waitin);
+        }
</ins><span class="cx">         //samples = skypiax_pipe_read(tech_pvt-&gt;audiopipe_srv[0], tech_pvt-&gt;read_frame.data, SAMPLES_PER_FRAME * sizeof(short));
</span><del>-        samples = SAMPLES_PER_FRAME * sizeof(short);
</del><ins>+                        switch_mutex_lock(tech_pvt-&gt;mutex_audio_srv);
</ins><span class="cx">         memcpy(tech_pvt-&gt;read_frame.data, tech_pvt-&gt;audiobuf_srv, SAMPLES_PER_FRAME * sizeof(short));
</span><span class="cx">         tech_pvt-&gt;flag_audio_srv = 0;
</span><ins>+                        switch_mutex_unlock(tech_pvt-&gt;mutex_audio_srv);
</ins><span class="cx"> 
</span><ins>+        samples = SAMPLES_PER_FRAME * sizeof(short);
</ins><span class="cx">         if (samples != SAMPLES_PER_FRAME * sizeof(short)) {
</span><span class="cx">                 if (samples)
</span><span class="cx">                         WARNINGA(&quot;read samples=%u expected=%u\n&quot;, SKYPIAX_P_LOG, samples, (int) (SAMPLES_PER_FRAME * sizeof(short)));
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>

</body>
</html>