<!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][14673] </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=14673">14673</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2009-08-29 03:12:44 -0500 (Sat, 29 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>celliax: dtmf detection</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 (14672 => 14673)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/celliax.h 2009-08-29 03:08:08 UTC (rev 14672)
+++ freeswitch/branches/gmaruzz/mod_celliax/celliax.h 2009-08-29 08:12:44 UTC (rev 14673)
</span><span class="lines">@@ -56,6 +56,8 @@
</span><span class="cx"> #include <termios.h>
</span><span class="cx"> #include <sys/ioctl.h>
</span><span class="cx"> #include <iconv.h>
</span><ins>+#include <libteletone.h>
+
</ins><span class="cx"> #ifdef CELLIAX_ALSA
</span><span class="cx"> #define ALSA_PCM_NEW_HW_PARAMS_API
</span><span class="cx"> #define ALSA_PCM_NEW_SW_PARAMS_API
</span><span class="lines">@@ -429,6 +431,9 @@
</span><span class="cx"> time_t audio_play_reset_timestamp;
</span><span class="cx"> int audio_play_reset_period;
</span><span class="cx">
</span><ins>+switch_timer_t timer;
+ teletone_dtmf_detect_state_t dtmf_detect;
+ switch_time_t old_dtmf_timestamp;
</ins><span class="cx">
</span><span class="cx"> };
</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 (14672 => 14673)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c 2009-08-29 03:08:08 UTC (rev 14672)
+++ freeswitch/branches/gmaruzz/mod_celliax/celliax_protocol.c 2009-08-29 08:12:44 UTC (rev 14673)
</span><span class="lines">@@ -4784,9 +4784,9 @@
</span><span class="cx"> time(&tech_pvt->audio_play_reset_timestamp);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- res = 0;
- if (res > 0)
- res = 0;
</del><ins>+ //res = 0;
+ //if (res > 0)
+ //res = 0;
</ins><span class="cx"> return res;
</span><span class="cx"> }
</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 (14672 => 14673)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c 2009-08-29 03:08:08 UTC (rev 14672)
+++ freeswitch/branches/gmaruzz/mod_celliax/mod_celliax.c 2009-08-29 08:12:44 UTC (rev 14673)
</span><span class="lines">@@ -252,6 +252,28 @@
</span><span class="cx"> ERRORA("celliax_codec FAILED\n", SKYPIAX_P_LOG);
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><ins>+
+int res;
+ res = alsa_init(tech_pvt);
+ if (res == -1) {
+ ERRORA("Failed initializing sound device\n", SKYPIAX_P_LOG);
+ /* we failed, free the PVT */
+ //if (tmp)
+ //free(tmp);
+ //return NULL;
+ }
+
+
+
+ //teletone_dtmf_detect_init(&tech_pvt->dtmf_detect, tech_pvt->read_codec.implementation->actual_samples_per_second);
+ teletone_dtmf_detect_init(&tech_pvt->dtmf_detect, 8000);
+
+ if (switch_core_timer_init(&tech_pvt->timer, "soft", 20, tech_pvt->read_codec.implementation->samples_per_packet, celliax_module_pool) != SWITCH_STATUS_SUCCESS) {
+ ERRORA("setup timer failed\n", SKYPIAX_P_LOG);
+ return SWITCH_STATUS_FALSE;
+ }
+
+
</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">@@ -456,6 +478,11 @@
</span><span class="cx"> if (switch_core_codec_ready(&tech_pvt->write_codec)) {
</span><span class="cx"> switch_core_codec_destroy(&tech_pvt->write_codec);
</span><span class="cx"> }
</span><ins>+
+ switch_core_timer_destroy(&tech_pvt->timer);
+
+alsa_shutdown(tech_pvt);
+
</ins><span class="cx"> *tech_pvt->session_uuid_str = '\0';
</span><span class="cx"> tech_pvt->interface_state = SKYPIAX_STATE_IDLE;
</span><span class="cx"> if (tech_pvt->skype_callflow == CALLFLOW_STATUS_FINISHED) {
</span><span class="lines">@@ -659,21 +686,52 @@
</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(&globals.timer, SWITCH_TRUE);
- //globals.read_frame.timestamp = globals.timer.samplecount;
</del><ins>+ switch_core_timer_check(&tech_pvt->timer, SWITCH_TRUE);
+ tech_pvt->read_frame.timestamp = tech_pvt->timer.samplecount;
</ins><span class="cx"> *frame = &tech_pvt->read_frame;
</span><span class="cx">
</span><span class="cx"> //status = SWITCH_STATUS_SUCCESS;
</span><ins>+ switch_set_flag(tech_pvt, TFLAG_VOICE);
</ins><span class="cx"> }
</span><del>- switch_set_flag(tech_pvt, TFLAG_VOICE);
</del><span class="cx">
</span><ins>+if(samples != 160)
+ ERRORA("samples=%d\n", SKYPIAX_P_LOG, samples);
</ins><span class="cx">
</span><ins>+ //WARNINGA("samples=%d\n", SKYPIAX_P_LOG, samples);
+
</ins><span class="cx"> //usleep(17000);
</span><span class="cx"> //usleep(17000);
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+ char digit_str[256];
</ins><span class="cx">
</span><ins>+
+ memset(digit_str, 0, sizeof(digit_str));
+ teletone_dtmf_detect(&tech_pvt->dtmf_detect, tech_pvt->read_frame.data, tech_pvt->read_frame.samples);
+ teletone_dtmf_get(&tech_pvt->dtmf_detect, digit_str, sizeof(digit_str));
+
+ if (digit_str[0]) {
+ NOTICA("DTMF DETECTED: [%s]\n", SKYPIAX_P_LOG, digit_str);
+ switch_time_t new_dtmf_timestamp = switch_time_now();
+ if((new_dtmf_timestamp - tech_pvt->old_dtmf_timestamp) > 350000) { //FIXME: make it configurable
+ char *p = digit_str;
+ switch_channel_t *channel = switch_core_session_get_channel(session);
+
+ while(p && *p) {
+ switch_dtmf_t dtmf;
+ dtmf.digit = *p;
+ dtmf.duration = SWITCH_DEFAULT_DTMF_DURATION;
+ switch_channel_queue_dtmf(channel, &dtmf);
+ p++;
+ }
+ NOTICA("DTMF DETECTED: [%s] new_dtmf_timestamp: %u, delta_t: %u\n", SKYPIAX_P_LOG, digit_str, (unsigned int)new_dtmf_timestamp, (unsigned int)(new_dtmf_timestamp - tech_pvt->old_dtmf_timestamp));
+ tech_pvt->old_dtmf_timestamp = new_dtmf_timestamp;
+ }
+ }
+
+
+
</ins><span class="cx"> #ifdef NOTDEF
</span><span class="cx">
</span><span class="cx"> if (!celliax_audio_read(tech_pvt)) {
</span><span class="lines">@@ -761,7 +819,7 @@
</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><del>- alsa_write(tech_pvt, frame->data, (int) (frame->datalen));
</del><ins>+ sent = alsa_write(tech_pvt, frame->data, (int) (frame->datalen));
</ins><span class="cx">
</span><span class="cx"> #ifdef NOTDEF //FIXME
</span><span class="cx"> #ifdef WIN32
</span><span class="lines">@@ -770,10 +828,11 @@
</span><span class="cx"> sent = write(tech_pvt->audioskypepipe[1], frame->data, sent);
</span><span class="cx"> #endif /* WIN32 */
</span><span class="cx"> #endif //NOTDEF
</span><del>- if (sent != frame->datalen && sent != -1) {
- DEBUGA_SKYPE("CLI PIPE write %d\n", SKYPIAX_P_LOG, sent);
</del><ins>+ if (sent && sent != frame->datalen/2 && sent != -1) {
+ DEBUGA_SKYPE("sent %d\n", SKYPIAX_P_LOG, sent);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ //NOTICA("sent=%d\n", SKYPIAX_P_LOG, sent);
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1462,6 +1521,7 @@
</span><span class="cx">
</span><span class="cx"> switch_sleep(100000);
</span><span class="cx">
</span><ins>+#ifdef NOTDEF
</ins><span class="cx"> res = alsa_init(&globals.SKYPIAX_INTERFACES[interface_id]);
</span><span class="cx"> if (res == -1) {
</span><span class="cx"> ERRORA("Failed initializing sound device\n", SKYPIAX_P_LOG);
</span><span class="lines">@@ -1471,7 +1531,6 @@
</span><span class="cx"> //return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#ifdef NOTDEF
</del><span class="cx"> switch_threadattr_create(&celliax_signaling_thread_attr, celliax_module_pool);
</span><span class="cx"> switch_threadattr_stacksize_set(celliax_signaling_thread_attr, SWITCH_THREAD_STACKSIZE);
</span><span class="cx"> switch_thread_create(&globals.SKYPIAX_INTERFACES[interface_id].celliax_signaling_thread, celliax_signaling_thread_attr, celliax_signaling_thread_func, &globals.SKYPIAX_INTERFACES[interface_id], celliax_module_pool);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>