<!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][16261] </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=16261">16261</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2010-01-12 10:24:23 -0600 (Tue, 12 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>gsmopen: portaudio reads from config, speex reset echo_state when portaudio reads a number of samples different from 160 (usually 0)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchbranchesgmaruzzmod_gsmopengsmopen_protocolcpp">freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp</a></li>
<li><a href="#freeswitchbranchesgmaruzzmod_gsmopenmod_gsmopencpp">freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchbranchesgmaruzzmod_gsmopengsmopen_protocolcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp (16260 => 16261)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp 2010-01-12 16:13:03 UTC (rev 16260)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp 2010-01-12 16:24:23 UTC (rev 16261)
</span><span class="lines">@@ -124,6 +124,7 @@
</span><span class="cx"> PaStreamParameters inputParameters, outputParameters;
</span><span class="cx"> int numdevices;
</span><span class="cx"> const PaDeviceInfo *deviceInfo;
</span><ins>+ long owner=1;
</ins><span class="cx">
</span><span class="cx"> #ifndef GIOVA48
</span><span class="cx"> setenv("PA_ALSA_PLUGHW", "1", 1);
</span><span class="lines">@@ -211,7 +212,8 @@
</span><span class="cx"> #ifndef GIOVA48
</span><span class="cx"> OpenAudioStream(&tech_pvt->stream, &inputParameters, &outputParameters, 8000,
</span><span class="cx"> paDitherOff | paClipOff, SAMPLES_PER_FRAME, tech_pvt->audiopipe[1],
</span><del>- &tech_pvt->speexecho, &tech_pvt->speexpreprocess, &tech_pvt->owner);
</del><ins>+ &tech_pvt->speexecho, &tech_pvt->speexpreprocess, &owner);
+ //&tech_pvt->speexecho, &tech_pvt->speexpreprocess, &tech_pvt->owner);
</ins><span class="cx">
</span><span class="cx"> #else // GIOVA48
</span><span class="cx"> OpenAudioStream(&tech_pvt->stream, &inputParameters, &outputParameters, 48000,
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_gsmopenmod_gsmopencpp"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp (16260 => 16261)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp 2010-01-12 16:13:03 UTC (rev 16260)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp 2010-01-12 16:24:23 UTC (rev 16261)
</span><span class="lines">@@ -846,6 +846,9 @@
</span><span class="cx"> tech_pvt->read_frame.datalen = 2;
</span><span class="cx"> tech_pvt->read_frame.flags = SFF_CNG;
</span><span class="cx"> *frame = &tech_pvt->read_frame;
</span><ins>+#ifdef GSMOPEN_PORTAUDIO
+ speex_echo_state_reset(tech_pvt->stream->echo_state);
+#endif // GSMOPEN_PORTAUDIO
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -1313,6 +1316,10 @@
</span><span class="cx"> #else
</span><span class="cx"> const char *no_sound = "1";
</span><span class="cx"> #endif // defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
</span><ins>+ const char *portaudiocindex = "1";
+ const char *portaudiopindex = "1";
+ const char *speexecho = "1";
+ const char *speexpreprocess = "1";
</ins><span class="cx">
</span><span class="cx"> uint32_t interface_id = 0;
</span><span class="cx"> #ifdef WIN32
</span><span class="lines">@@ -1459,8 +1466,14 @@
</span><span class="cx"> alsacname = val;
</span><span class="cx"> } else if (!strcasecmp(var, "alsapname")) {
</span><span class="cx"> alsapname = val;
</span><del>-
-
</del><ins>+ } else if (!strcasecmp(var, "portaudiocindex")) {
+ portaudiocindex = val;
+ } else if (!strcasecmp(var, "portaudiopindex")) {
+ portaudiopindex = val;
+ } else if (!strcasecmp(var, "speexecho")) {
+ speexecho = val;
+ } else if (!strcasecmp(var, "speexpreprocess")) {
+ speexpreprocess = val;
</ins><span class="cx"> } else if (!strcasecmp(var, "at_early_audio")) {
</span><span class="cx"> at_early_audio = val;
</span><span class="cx"> } else if (!strcasecmp(var, "at_after_preinit_pause")) {
</span><span class="lines">@@ -1649,6 +1662,12 @@
</span><span class="cx"> switch_set_string(globals.GSMOPEN_INTERFACES[interface_id].alsapname, alsapname);
</span><span class="cx"> #endif// GSMOPEN_ALSA
</span><span class="cx">
</span><ins>+#ifdef GSMOPEN_PORTAUDIO
+ globals.GSMOPEN_INTERFACES[interface_id].portaudiocindex = atoi(portaudiocindex);
+ globals.GSMOPEN_INTERFACES[interface_id].portaudiopindex = atoi(portaudiopindex);
+ globals.GSMOPEN_INTERFACES[interface_id].speexecho = atoi(speexecho);
+ globals.GSMOPEN_INTERFACES[interface_id].speexpreprocess = atoi(speexpreprocess);
+#endif// GSMOPEN_PORTAUDIO
</ins><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].at_early_audio = atoi(at_early_audio);
</span><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].at_after_preinit_pause = atoi(at_after_preinit_pause);
</span><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].at_initial_pause = atoi(at_initial_pause);
</span><span class="lines">@@ -1693,10 +1712,10 @@
</span><span class="cx">
</span><span class="cx"> #ifdef GSMOPEN_PORTAUDIO
</span><span class="cx"> //FIXME
</span><del>- globals.GSMOPEN_INTERFACES[interface_id].portaudiocindex = 1;
- globals.GSMOPEN_INTERFACES[interface_id].portaudiopindex = 1;
- globals.GSMOPEN_INTERFACES[interface_id].speexecho = 1;
- globals.GSMOPEN_INTERFACES[interface_id].speexpreprocess = 1;
</del><ins>+ //globals.GSMOPEN_INTERFACES[interface_id].portaudiocindex = 1;
+ //globals.GSMOPEN_INTERFACES[interface_id].portaudiopindex = 1;
+ //globals.GSMOPEN_INTERFACES[interface_id].speexecho = 1;
+ //globals.GSMOPEN_INTERFACES[interface_id].speexpreprocess = 1;
</ins><span class="cx"> DEBUGA_GSMOPEN("portaudiocindex=%d\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].portaudiocindex);
</span><span class="cx"> DEBUGA_GSMOPEN("portaudiocindex=%d\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].portaudiocindex);
</span><span class="cx"> DEBUGA_GSMOPEN("speexecho=%d\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].speexecho);
</span><span class="lines">@@ -1793,6 +1812,8 @@
</span><span class="cx"> #ifdef GSMOPEN_PORTAUDIO
</span><span class="cx"> DEBUGA_GSMOPEN("portaudiocindex=%d\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].portaudiocindex);
</span><span class="cx"> DEBUGA_GSMOPEN("portaudiopindex=%d\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].portaudiopindex);
</span><ins>+ DEBUGA_GSMOPEN("speexecho=%d\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].speexecho);
+ DEBUGA_GSMOPEN("speexpreprocess=%d\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].speexpreprocess);
</ins><span class="cx"> #endif// GSMOPEN_PORTAUDIO
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>