<!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][14684] </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=14684">14684</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2009-08-30 18:46:25 -0500 (Sun, 30 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>celliax: use two audio timers, one for read and one for write</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchbranchesgmaruzzmod_celliaxcelliaxh">freeswitch/branches/gmaruzz/mod_celliax/celliax.h</a></li>
<li><a href="#freeswitchbranchesgmaruzzmod_celliaxcelliax_protocolc">freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c</a></li>
<li><a href="#freeswitchbranchesgmaruzzmod_celliaxmod_celliaxc">freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchbranchesgmaruzzmod_celliaxcelliaxh"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_celliax/celliax.h (14683 => 14684)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/celliax.h 2009-08-30 19:44:25 UTC (rev 14683)
+++ freeswitch/branches/gmaruzz/mod_celliax/celliax.h 2009-08-30 23:46:25 UTC (rev 14684)
</span><span class="lines">@@ -432,7 +432,8 @@
</span><span class="cx"> time_t audio_play_reset_timestamp;
</span><span class="cx"> int audio_play_reset_period;
</span><span class="cx">
</span><del>- switch_timer_t timer;
</del><ins>+ switch_timer_t timer_read;
+ switch_timer_t timer_write;
</ins><span class="cx"> teletone_dtmf_detect_state_t dtmf_detect;
</span><span class="cx"> switch_time_t old_dtmf_timestamp;
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_celliaxcelliax_protocolc"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c (14683 => 14684)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c 2009-08-30 19:44:25 UTC (rev 14683)
+++ freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c 2009-08-30 23:46:25 UTC (rev 14684)
</span><span class="lines">@@ -4686,17 +4686,20 @@
</span><span class="cx">
</span><span class="cx"> left = datalen;
</span><span class="cx">
</span><ins>+#if 0
</ins><span class="cx"> struct timeval to;
</span><span class="cx"> fd_set rfds;
</span><span class="cx"> int result;
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> FD_ZERO(&rfds);
</span><span class="cx"> FD_SET(tech_pvt->celliax_sound_capt_fd, &rfds);
</span><span class="cx">
</span><span class="cx"> /* Wait for something to happen */
</span><span class="cx"> to.tv_sec = 0;
</span><del>- to.tv_usec = 500000; /* we select with this timeout because under cygwin we avoid the signal usage, so there is no way to end the thread if it is stuck waiting for select */
</del><ins>+ //to.tv_usec = 500000; /* we select with this timeout because under cygwin we avoid the signal usage, so there is no way to end the thread if it is stuck waiting for select */
+ to.tv_usec = 20000; /* we select with this timeout because under cygwin we avoid the signal usage, so there is no way to end the thread if it is stuck waiting for select */
</ins><span class="cx"> result = select(tech_pvt->celliax_sound_capt_fd + 1, &rfds, NULL, NULL, &to);
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -4717,10 +4720,11 @@
</span><span class="cx"> /* If there are no file descriptors changed, just continue */
</span><span class="cx">
</span><span class="cx"> if (result == 0) {
</span><del>- usleep(10000); //let's breath
- ERRORA("select returned %d: %s\n", SKYPIAX_P_LOG, result, strerror(errno));
</del><ins>+ DEBUGA_SKYPE("select returned %d: no file descriptor ready to be read, read would return -EAGAIN\n", SKYPIAX_P_LOG, result);
+ usleep(500); //let's breath
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -4738,7 +4742,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> state = snd_pcm_state(tech_pvt->alsac);
</span><span class="cx"> if (state != SND_PCM_STATE_RUNNING) {
</span><span class="cx"> DEBUGA_SKYPE("ALSA read state is not SND_PCM_STATE_RUNNING\n", SKYPIAX_P_LOG);
</span><span class="lines">@@ -4765,8 +4768,8 @@
</span><span class="cx"> buf2 = __buf2 + ((AST_FRIENDLY_OFFSET / 2) * 2);
</span><span class="cx">
</span><span class="cx"> if (tech_pvt->alsa_capture_is_mono) {
</span><del>- //DEBUGA_SKYPE("buf=%p, buf+readpos=%p, datalen=%d, left=%d\n", SKYPIAX_P_LOG, (void *)buf, (void *)(buf + readpos), datalen, left);
</del><span class="cx"> r = snd_pcm_readi(tech_pvt->alsac, buf + readpos, left);
</span><ins>+ //DEBUGA_SKYPE("r=%d, buf=%p, buf+readpos=%p, datalen=%d, left=%d\n", SKYPIAX_P_LOG, r, (void *)buf, (void *)(buf + readpos), datalen, left);
</ins><span class="cx"> } else {
</span><span class="cx"> r = snd_pcm_readi(tech_pvt->alsac, buf2 + (readpos * 2), left);
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_celliaxmod_celliaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c (14683 => 14684)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c 2009-08-30 19:44:25 UTC (rev 14683)
+++ freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c 2009-08-30 23:46:25 UTC (rev 14684)
</span><span class="lines">@@ -256,13 +256,23 @@
</span><span class="cx"> //teletone_dtmf_detect_init(&tech_pvt->dtmf_detect, tech_pvt->read_codec.implementation->actual_samples_per_second);
</span><span class="cx"> teletone_dtmf_detect_init(&tech_pvt->dtmf_detect, 8000);
</span><span class="cx">
</span><del>- if (switch_core_timer_init(&tech_pvt->timer, "soft", 20, tech_pvt->read_codec.implementation->samples_per_packet, celliax_module_pool) !=
</del><ins>+ if (switch_core_timer_init(&tech_pvt->timer_read, "soft", 20, tech_pvt->read_codec.implementation->samples_per_packet, celliax_module_pool) !=
</ins><span class="cx"> SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> ERRORA("setup timer failed\n", SKYPIAX_P_LOG);
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ switch_core_timer_sync(&tech_pvt->timer_read);
</ins><span class="cx">
</span><ins>+ if (switch_core_timer_init(&tech_pvt->timer_write, "soft", 20, tech_pvt->write_codec.implementation->samples_per_packet, celliax_module_pool) !=
+ SWITCH_STATUS_SUCCESS) {
+ ERRORA("setup timer failed\n", SKYPIAX_P_LOG);
+ return SWITCH_STATUS_FALSE;
+ }
+
+ switch_core_timer_sync(&tech_pvt->timer_write);
+
+
</ins><span class="cx"> switch_clear_flag(tech_pvt, TFLAG_HANGUP);
</span><span class="cx"> DEBUGA_SKYPE("celliax_codec SUCCESS\n", SKYPIAX_P_LOG);
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -468,7 +478,8 @@
</span><span class="cx"> switch_core_codec_destroy(&tech_pvt->write_codec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_core_timer_destroy(&tech_pvt->timer);
</del><ins>+ switch_core_timer_destroy(&tech_pvt->timer_read);
+ switch_core_timer_destroy(&tech_pvt->timer_write);
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> *tech_pvt->session_uuid_str = '\0';
</span><span class="lines">@@ -663,6 +674,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+ switch_core_timer_next(&tech_pvt->timer_read);
</ins><span class="cx">
</span><span class="cx"> int samples;
</span><span class="cx">
</span><span class="lines">@@ -671,18 +683,20 @@
</span><span class="cx"> tech_pvt->read_frame.datalen = samples * 2;
</span><span class="cx"> tech_pvt->read_frame.samples = samples;
</span><span class="cx">
</span><del>- switch_core_timer_check(&tech_pvt->timer, SWITCH_TRUE);
- tech_pvt->read_frame.timestamp = tech_pvt->timer.samplecount;
</del><ins>+ //switch_core_timer_check(&tech_pvt->timer, SWITCH_TRUE);
+ tech_pvt->read_frame.timestamp = tech_pvt->timer_read.samplecount;
</ins><span class="cx"> *frame = &tech_pvt->read_frame;
</span><span class="cx">
</span><span class="cx"> //status = SWITCH_STATUS_SUCCESS;
</span><span class="cx"> switch_set_flag(tech_pvt, TFLAG_VOICE);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (samples != 160)
</del><ins>+ if (samples != 160){
</ins><span class="cx"> ERRORA("samples=%d\n", SKYPIAX_P_LOG, samples);
</span><ins>+ goto cng;
+}
</ins><span class="cx">
</span><del>- //WARNINGA("samples=%d\n", SKYPIAX_P_LOG, samples);
</del><ins>+//DEBUGA_SKYPE("samples=%d tech_pvt->read_frame.timestamp=%d\n", SKYPIAX_P_LOG, samples, tech_pvt->read_frame.timestamp);
</ins><span class="cx">
</span><span class="cx"> //usleep(17000);
</span><span class="cx"> //usleep(17000);
</span><span class="lines">@@ -796,12 +810,14 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ switch_core_timer_next(&tech_pvt->timer_write);
</ins><span class="cx"> sent = frame->datalen;
</span><span class="cx">
</span><span class="cx"> //ERRORA("PLAY \n", SKYPIAX_P_LOG);
</span><span class="cx"> //snd_pcm_writei(tech_pvt->alsap, (short *) frame->data, (int) (frame->datalen / 2));
</span><span class="cx">
</span><span class="cx"> sent = alsa_write(tech_pvt, frame->data, (int) (frame->datalen));
</span><ins>+//DEBUGA_SKYPE("sent=%d \n", SKYPIAX_P_LOG, sent);
</ins><span class="cx">
</span><span class="cx"> #ifdef NOTDEF //FIXME
</span><span class="cx"> #ifdef WIN32
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>