<!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][16258] </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=16258">16258</a></dd>
<dt>Author</dt> <dd>gmaruzz</dd>
<dt>Date</dt> <dd>2010-01-12 08:44:02 -0600 (Tue, 12 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>gsmopen: conditionally compile with portaudio and speex. This will hopefully solve the sidetone echo generated by cellphones used as interfaces</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchbranchesgmaruzzmod_gsmopengsmopenh">freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h</a></li>
<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_gsmopengsmopenh"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h (16257 => 16258)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h 2010-01-12 14:42:58 UTC (rev 16257)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h 2010-01-12 14:44:02 UTC (rev 16258)
</span><span class="lines">@@ -75,6 +75,9 @@
</span><span class="cx"> #include <alsa/asoundlib.h>
</span><span class="cx"> #endif /* GSMOPEN_ALSA */
</span><span class="cx">
</span><ins>+#ifdef GSMOPEN_PORTAUDIO
+#include "pablio.h"
+#endif// GSMOPEN_PORTAUDIO
</ins><span class="cx">
</span><span class="cx"> #ifndef WIN32
</span><span class="cx"> #include <sys/time.h>
</span><span class="lines">@@ -461,6 +464,15 @@
</span><span class="cx">
</span><span class="cx"> int no_sound;
</span><span class="cx">
</span><ins>+#ifdef GSMOPEN_PORTAUDIO
+ int speexecho;
+ int speexpreprocess;
+ int portaudiocindex; /*!< \brief Index of the Portaudio capture audio device */
+ int portaudiopindex; /*!< \brief Index of the Portaudio playback audio device */
+ PABLIO_Stream *stream;
+
+#endif// GSMOPEN_PORTAUDIO
+
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef struct private_object private_t;
</span><span class="lines">@@ -591,3 +603,19 @@
</span><span class="cx">
</span><span class="cx"> int iso_8859_1_to_utf8(private_t * tech_pvt, char *iso_8859_1_in, char *utf8_out, size_t outbytesleft);
</span><span class="cx"> int gsmopen_serial_getstatus_AT(private_t * tech_pvt);
</span><ins>+
+
+#ifdef GSMOPEN_PORTAUDIO
+
+int gsmopen_portaudio_devlist(private_t *tech_pvt);
+
+int gsmopen_portaudio_init(private_t *tech_pvt);
+
+int gsmopen_portaudio_write(private_t * tech_pvt, short *data, int datalen);
+
+int gsmopen_portaudio_read(private_t * tech_pvt, short *data, int datalen);
+
+
+int gsmopen_portaudio_shutdown(private_t *tech_pvt);
+
+#endif // GSMOPEN_PORTAUDIO
</ins></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_gsmopengsmopen_protocolcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp (16257 => 16258)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp 2010-01-12 14:42:58 UTC (rev 16257)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp 2010-01-12 14:44:02 UTC (rev 16258)
</span><span class="lines">@@ -88,6 +88,319 @@
</span><span class="cx"> /***************/
</span><span class="cx"> #endif /* WIN32 */
</span><span class="cx">
</span><ins>+#ifdef GSMOPEN_PORTAUDIO
+#include "pablio.h"
+
+#ifndef GIOVA48
+#define SAMPLES_PER_FRAME 160
+#else // GIOVA48
+#define SAMPLES_PER_FRAME 960
+#endif // GIOVA48
+
+int gsmopen_portaudio_devlist(private_t *tech_pvt)
+{
+ int i, numDevices;
+ const PaDeviceInfo *deviceInfo;
+
+ numDevices = Pa_GetDeviceCount();
+ if (numDevices < 0) {
+ return 0;
+ }
+ for (i = 0; i < numDevices; i++) {
+ deviceInfo = Pa_GetDeviceInfo(i);
+ NOTICA
+ ("Found PORTAUDIO device: id=%d\tname=%s\tmax input channels=%d\tmax output channels=%d\n",
+ GSMOPEN_P_LOG, i, deviceInfo->name, deviceInfo->maxInputChannels,
+ deviceInfo->maxOutputChannels);
+ }
+
+ return numDevices;
+}
+
+int gsmopen_portaudio_init(private_t *tech_pvt)
+{
+ PaError err;
+ int c;
+ PaStreamParameters inputParameters, outputParameters;
+ int numdevices;
+ const PaDeviceInfo *deviceInfo;
+
+#ifndef GIOVA48
+ setenv("PA_ALSA_PLUGHW", "1", 1);
+#endif // GIOVA48
+
+ err = Pa_Initialize();
+ if (err != paNoError)
+ return err;
+
+ numdevices = gsmopen_portaudio_devlist(tech_pvt);
+
+ if (tech_pvt->portaudiocindex > (numdevices - 1)) {
+ ERRORA("Portaudio Capture id=%d is out of range: valid id are from 0 to %d\n",
+ GSMOPEN_P_LOG, tech_pvt->portaudiocindex, (numdevices - 1));
+ return -1;
+ }
+
+ if (tech_pvt->portaudiopindex > (numdevices - 1)) {
+ ERRORA("Portaudio Playback id=%d is out of range: valid id are from 0 to %d\n",
+ GSMOPEN_P_LOG, tech_pvt->portaudiopindex, (numdevices - 1));
+ return -1;
+ }
+ //inputParameters.device = 0;
+ if (tech_pvt->portaudiocindex != -1) {
+ inputParameters.device = tech_pvt->portaudiocindex;
+ } else {
+ inputParameters.device = Pa_GetDefaultInputDevice();
+ }
+ deviceInfo = Pa_GetDeviceInfo(inputParameters.device);
+ NOTICA
+ ("Using INPUT PORTAUDIO device: id=%d\tname=%s\tmax input channels=%d\tmax output channels=%d\n",
+ GSMOPEN_P_LOG, inputParameters.device, deviceInfo->name,
+ deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels);
+ if (deviceInfo->maxInputChannels == 0) {
+ ERRORA
+ ("No INPUT channels on device: id=%d\tname=%s\tmax input channels=%d\tmax output channels=%d\n",
+ GSMOPEN_P_LOG, inputParameters.device, deviceInfo->name,
+ deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels);
+ return -1;
+ }
+ inputParameters.channelCount = 1;
+ inputParameters.sampleFormat = paInt16;
+ //inputParameters.suggestedLatency = Pa_GetDeviceInfo(inputParameters.device)->defaultHighInputLatency;
+ inputParameters.suggestedLatency = 0.1;
+ inputParameters.hostApiSpecificStreamInfo = NULL;
+
+ //outputParameters.device = 3;
+ if (tech_pvt->portaudiopindex != -1) {
+ outputParameters.device = tech_pvt->portaudiopindex;
+ } else {
+ outputParameters.device = Pa_GetDefaultOutputDevice();
+ }
+ deviceInfo = Pa_GetDeviceInfo(outputParameters.device);
+ NOTICA
+ ("Using OUTPUT PORTAUDIO device: id=%d\tname=%s\tmax input channels=%d\tmax output channels=%d\n",
+ GSMOPEN_P_LOG, outputParameters.device, deviceInfo->name,
+ deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels);
+ if (deviceInfo->maxOutputChannels == 0) {
+ ERRORA
+ ("No OUTPUT channels on device: id=%d\tname=%s\tmax input channels=%d\tmax output channels=%d\n",
+ GSMOPEN_P_LOG, inputParameters.device, deviceInfo->name,
+ deviceInfo->maxInputChannels, deviceInfo->maxOutputChannels);
+ return -1;
+ }
+#ifndef GIOVA48
+ outputParameters.channelCount = 1;
+#else // GIOVA48
+ outputParameters.channelCount = 2;
+#endif // GIOVA48
+ outputParameters.sampleFormat = paInt16;
+ //outputParameters.suggestedLatency = Pa_GetDeviceInfo(outputParameters.device)->defaultHighOutputLatency;
+ outputParameters.suggestedLatency = 0.1;
+ outputParameters.hostApiSpecificStreamInfo = NULL;
+
+/* build the pipe that will be polled on by pbx */
+ c = pipe(tech_pvt->audiopipe);
+ if (c) {
+ ERRORA("Unable to create audio pipe\n", GSMOPEN_P_LOG);
+ return -1;
+ }
+ fcntl(tech_pvt->audiopipe[0], F_SETFL, O_NONBLOCK);
+ fcntl(tech_pvt->audiopipe[1], F_SETFL, O_NONBLOCK);
+
+ err =
+#ifndef GIOVA48
+ OpenAudioStream(&tech_pvt->stream, &inputParameters, &outputParameters, 8000,
+ paDitherOff | paClipOff, SAMPLES_PER_FRAME, tech_pvt->audiopipe[1],
+ &tech_pvt->speexecho, &tech_pvt->speexpreprocess, &tech_pvt->owner);
+
+#else // GIOVA48
+ OpenAudioStream(&tech_pvt->stream, &inputParameters, &outputParameters, 48000,
+ paDitherOff | paClipOff, SAMPLES_PER_FRAME, tech_pvt->audiopipe[1],
+ &tech_pvt->speexecho, &tech_pvt->speexpreprocess, &tech_pvt->owner);
+
+
+#endif// GIOVA48
+ if (err != paNoError) {
+ ERRORA("Unable to open audio stream: %s\n", GSMOPEN_P_LOG, Pa_GetErrorText(err));
+ return -1;
+ }
+
+/* the pipe is our audio fd for pbx to poll on */
+ tech_pvt->gsmopen_sound_capt_fd = tech_pvt->audiopipe[0];
+
+ return 0;
+}
+//int gsmopen_portaudio_write(private_t *tech_pvt, struct ast_frame *f)
+int gsmopen_portaudio_write(private_t * tech_pvt, short *data, int datalen)
+{
+ int samples;
+#ifdef GIOVA48
+ //short buf[GSMOPEN_FRAME_SIZE * 2];
+ short buf[3840];
+ short *buf2;
+
+ //ERRORA("1 f->datalen=: %d\n", GSMOPEN_P_LOG, f->datalen);
+
+
+
+
+ memset(buf, '\0', GSMOPEN_FRAME_SIZE *2);
+
+ buf2 = f->data;
+
+ int i=0, a=0;
+
+ for(i=0; i< f->datalen / sizeof(short); i++){
+//stereo, 2 chan 48 -> mono 8
+ buf[a] = buf2[i];
+ a++;
+ buf[a] = buf2[i];
+ a++;
+ buf[a] = buf2[i];
+ a++;
+ buf[a] = buf2[i];
+ a++;
+ buf[a] = buf2[i];
+ a++;
+ buf[a] = buf2[i];
+ a++;
+ buf[a] = buf2[i];
+ a++;
+ buf[a] = buf2[i];
+ a++;
+ buf[a] = buf2[i];
+ a++;
+ buf[a] = buf2[i];
+ a++;
+ buf[a] = buf2[i];
+ a++;
+ buf[a] = buf2[i];
+ a++;
+ /*
+ */
+ }
+ f->data = &buf;
+ f->datalen = f->datalen * 6;
+ //ERRORA("2 f->datalen=: %d\n", GSMOPEN_P_LOG, f->datalen);
+ //f->datalen = f->datalen;
+#endif // GIOVA48
+
+
+ samples =
+ WriteAudioStream(tech_pvt->stream, (short *) data, (int) (datalen / sizeof(short)));
+
+ if (samples != (int) (datalen / sizeof(short)))
+ ERRORA("WriteAudioStream wrote: %d of %d\n", GSMOPEN_P_LOG, samples,
+ (int) (datalen / sizeof(short)));
+
+ return 0;
+}
+//struct ast_frame *gsmopen_portaudio_read(private_t *tech_pvt)
+#define AST_FRIENDLY_OFFSET 0
+int gsmopen_portaudio_read(private_t * tech_pvt, short *data, int datalen)
+{
+ //static struct ast_frame f;
+ static short __buf[GSMOPEN_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2];
+ short *buf;
+ static short __buf2[GSMOPEN_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2];
+ short *buf2;
+ int samples;
+ //char c;
+
+ memset(__buf, '\0', (GSMOPEN_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2));
+
+ buf = __buf + AST_FRIENDLY_OFFSET / 2;
+
+ memset(__buf2, '\0', (GSMOPEN_FRAME_SIZE + AST_FRIENDLY_OFFSET / 2));
+
+ buf2 = __buf2 + AST_FRIENDLY_OFFSET / 2;
+
+#if 0
+ f.frametype = AST_FRAME_NULL;
+ f.subclass = 0;
+ f.samples = 0;
+ f.datalen = 0;
+
+#ifdef ASTERISK_VERSION_1_6_1
+ f.data.ptr = NULL;
+#else
+ f.data = NULL;
+#endif /* ASTERISK_VERSION_1_6_1 */
+ f.offset = 0;
+ f.src = gsmopen_type;
+ f.mallocd = 0;
+ f.delivery.tv_sec = 0;
+ f.delivery.tv_usec = 0;
+#endif //0
+
+ //if ((samples = ReadAudioStream(tech_pvt->stream, buf, SAMPLES_PER_FRAME)) == 0)
+ //if ((samples = ReadAudioStream(tech_pvt->stream, data, datalen/sizeof(short))) == 0)
+ if ((samples = ReadAudioStream(tech_pvt->stream, data, datalen)) == 0) {
+ //do nothing
+ } else {
+#ifdef GIOVA48
+ int i=0, a=0;
+
+ samples = samples / 6;
+ for(i=0; i< samples; i++){
+ buf2[i] = buf[a];
+ a = a + 6; //mono, 1 chan 48 -> 8
+ }
+ buf = buf2;
+
+#if 0
+ /* A real frame */
+ f.frametype = AST_FRAME_VOICE;
+ f.subclass = AST_FORMAT_SLINEAR;
+ f.samples = GSMOPEN_FRAME_SIZE/6;
+ f.datalen = GSMOPEN_FRAME_SIZE * 2/6;
+#endif //0
+#else// GIOVA48
+#if 0
+ /* A real frame */
+ f.frametype = AST_FRAME_VOICE;
+ f.subclass = AST_FORMAT_SLINEAR;
+ f.samples = GSMOPEN_FRAME_SIZE;
+ f.datalen = GSMOPEN_FRAME_SIZE * 2;
+#endif //0
+#endif// GIOVA48
+
+#if 0
+#ifdef ASTERISK_VERSION_1_6_1
+ f.data.ptr = buf;
+#else
+ f.data = buf;
+#endif /* ASTERISK_VERSION_1_6_1 */
+ f.offset = AST_FRIENDLY_OFFSET;
+ f.src = gsmopen_type;
+ f.mallocd = 0;
+#endif //0
+ }
+
+#if 0
+ read(tech_pvt->audiopipe[0], &c, 1);
+
+ return &f;
+#endif //0
+ return samples;
+}
+int gsmopen_portaudio_shutdown(private_t *tech_pvt)
+{
+ PaError err;
+
+ err = CloseAudioStream(tech_pvt->stream);
+
+ if (err != paNoError)
+ ERRORA("not able to CloseAudioStream\n", GSMOPEN_P_LOG);
+
+ Pa_Terminate();
+ return 0;
+}
+
+
+
+
+#endif // GSMOPEN_PORTAUDIO
</ins><span class="cx"> #ifndef GSMLIBGIO
</span><span class="cx"> int gsmopen_serial_init(private_t * tech_pvt, speed_t controldevice_speed)
</span><span class="cx"> {
</span><span class="lines">@@ -626,6 +939,10 @@
</span><span class="cx"> int at_ack = -1;
</span><span class="cx"> int la_read = 0;
</span><span class="cx">
</span><ins>+ if(!running || !tech_pvt->running){
+ return -1;
+ }
+
</ins><span class="cx"> FD_ZERO(&read_fds);
</span><span class="cx"> FD_SET(tech_pvt->controldevfd, &read_fds);
</span><span class="cx">
</span><span class="lines">@@ -2452,7 +2769,6 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-//#define GSMOPEN_ALSA
</del><span class="cx"> #ifdef GSMOPEN_ALSA
</span><span class="cx"> /*! \brief ALSA pcm format, according to endianess */
</span><span class="cx"> #if __BYTE_ORDER == __LITTLE_ENDIAN
</span><span class="lines">@@ -3209,7 +3525,7 @@
</span><span class="cx"> {
</span><span class="cx"> //char *idest = data;
</span><span class="cx"> //char rdest[256];
</span><del>- //struct gsmopen_pvt *p = NULL;
</del><ins>+ //private_t *p = NULL;
</ins><span class="cx"> //char *device;
</span><span class="cx"> //char *dest;
</span><span class="cx"> //char *text;
</span></span></pre></div>
<a id="freeswitchbranchesgmaruzzmod_gsmopenmod_gsmopencpp"></a>
<div class="modfile"><h4>Modified: freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp (16257 => 16258)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp 2010-01-12 14:42:58 UTC (rev 16257)
+++ freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp 2010-01-12 14:44:02 UTC (rev 16258)
</span><span class="lines">@@ -276,6 +276,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #endif// GSMOPEN_ALSA
</span><ins>+#ifdef GSMOPEN_PORTAUDIO
+ if(tech_pvt->no_sound==0){
+ if (gsmopen_portaudio_init(tech_pvt)) {
+ ERRORA("gsmopen_portaudio_init failed\n", GSMOPEN_P_LOG);
+ return SWITCH_STATUS_FALSE;
+
+ }
+ }
+#endif// GSMOPEN_PORTAUDIO
+
</ins><span class="cx"> if (switch_core_timer_init(&tech_pvt->timer_read, "soft", 20, tech_pvt->read_codec.implementation->samples_per_packet, gsmopen_module_pool) !=
</span><span class="cx"> SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> ERRORA("setup timer failed\n", GSMOPEN_P_LOG);
</span><span class="lines">@@ -515,7 +525,16 @@
</span><span class="cx"> alsa_shutdown(tech_pvt);
</span><span class="cx"> }
</span><span class="cx"> #endif// GSMOPEN_ALSA
</span><ins>+#ifdef GSMOPEN_PORTAUDIO
+ if(tech_pvt->no_sound==0){
+ if (gsmopen_portaudio_shutdown(tech_pvt)) {
+ ERRORA("gsmopen_portaudio_shutdown failed\n", GSMOPEN_P_LOG);
</ins><span class="cx">
</span><ins>+ }
+ }
+#endif// GSMOPEN_PORTAUDIO
+
+
</ins><span class="cx"> *tech_pvt->session_uuid_str = '\0';
</span><span class="cx"> tech_pvt->interface_state = GSMOPEN_STATE_IDLE;
</span><span class="cx"> if (tech_pvt->phone_callflow == CALLFLOW_STATUS_FINISHED) {
</span><span class="lines">@@ -689,10 +708,10 @@
</span><span class="cx"> switch_channel_t *channel = NULL;
</span><span class="cx"> private_t *tech_pvt = NULL;
</span><span class="cx"> switch_byte_t *data;
</span><del>-#ifdef GSMOPEN_ALSA
</del><ins>+#if defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
</ins><span class="cx"> int samples;
</span><span class="cx"> char digit_str[256];
</span><del>-#endif// GSMOPEN_ALSA
</del><ins>+#endif // defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
</ins><span class="cx">
</span><span class="cx"> channel = switch_core_session_get_channel(session);
</span><span class="cx"> switch_assert(channel != NULL);
</span><span class="lines">@@ -720,9 +739,15 @@
</span><span class="cx"> if(tech_pvt->no_sound==1){
</span><span class="cx"> goto cng;
</span><span class="cx"> }
</span><ins>+#if defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
</ins><span class="cx"> #ifdef GSMOPEN_ALSA
</span><span class="cx"> //if ((samples = snd_pcm_readi(tech_pvt->alsac, tech_pvt->read_frame.data, tech_pvt->read_codec.implementation->samples_per_packet)) > 0)
</span><del>- if ((samples = alsa_read(tech_pvt, (short *) tech_pvt->read_frame.data, tech_pvt->read_codec.implementation->samples_per_packet)) > 0) {
</del><ins>+ if ((samples = alsa_read(tech_pvt, (short *) tech_pvt->read_frame.data, tech_pvt->read_codec.implementation->samples_per_packet)) > 0)
+#endif// GSMOPEN_ALSA
+#ifdef GSMOPEN_PORTAUDIO
+ if ((samples = gsmopen_portaudio_read(tech_pvt, (short *) tech_pvt->read_frame.data, tech_pvt->read_codec.implementation->samples_per_packet)) > 0)
+#endif// GSMOPEN_PORTAUDIO
+ {
</ins><span class="cx">
</span><span class="cx"> tech_pvt->read_frame.datalen = samples * 2;
</span><span class="cx"> tech_pvt->read_frame.samples = samples;
</span><span class="lines">@@ -741,6 +766,7 @@
</span><span class="cx"> switch_set_flag(tech_pvt, TFLAG_VOICE);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ //WARNINGA("samples=%d\n", GSMOPEN_P_LOG, samples);
</ins><span class="cx"> if (samples != 160) {
</span><span class="cx"> ERRORA("samples=%d\n", GSMOPEN_P_LOG, samples);
</span><span class="cx"> goto cng;
</span><span class="lines">@@ -812,7 +838,7 @@
</span><span class="cx">
</span><span class="cx"> DEBUGA_GSMOPEN("CHANNEL READ FALSE\n", GSMOPEN_P_LOG);
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><del>-#endif// GSMOPEN_ALSA
</del><ins>+#endif // defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
</ins><span class="cx"> cng:
</span><span class="cx"> data = (switch_byte_t *) tech_pvt->read_frame.data;
</span><span class="cx"> data[0] = 65;
</span><span class="lines">@@ -828,9 +854,9 @@
</span><span class="cx"> {
</span><span class="cx"> switch_channel_t *channel = NULL;
</span><span class="cx"> private_t *tech_pvt = NULL;
</span><del>-#ifdef GSMOPEN_ALSA
</del><ins>+#if defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
</ins><span class="cx"> unsigned int sent;
</span><del>-#endif// GSMOPEN_ALSA
</del><ins>+#endif // defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
</ins><span class="cx">
</span><span class="cx"> channel = switch_core_session_get_channel(session);
</span><span class="cx"> switch_assert(channel != NULL);
</span><span class="lines">@@ -868,6 +894,15 @@
</span><span class="cx"> DEBUGA_GSMOPEN("sent %d\n", GSMOPEN_P_LOG, sent);
</span><span class="cx"> }
</span><span class="cx"> #endif// GSMOPEN_ALSA
</span><ins>+#ifdef GSMOPEN_PORTAUDIO
+ sent = gsmopen_portaudio_write(tech_pvt, (short *) frame->data, (int) (frame->datalen));
+//DEBUGA_GSMOPEN("sent=%d \n", GSMOPEN_P_LOG, sent);
+
+ if (sent && sent != frame->datalen / 2 && sent != -1) {
+ DEBUGA_GSMOPEN("sent %d\n", GSMOPEN_P_LOG, sent);
+ }
+
+#endif // GSMOPEN_PORTAUDIO
</ins><span class="cx"> //NOTICA("sent=%d\n", GSMOPEN_P_LOG, sent);
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -922,10 +957,10 @@
</span><span class="cx"> {
</span><span class="cx"> switch_channel_t *channel;
</span><span class="cx"> private_t *tech_pvt;
</span><del>-#ifdef GSMOPEN_ALSA
</del><ins>+#if defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
</ins><span class="cx"> int samples;
</span><span class="cx"> short tmp_buffer[1280];
</span><del>-#endif// GSMOPEN_ALSA
</del><ins>+#endif // defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
</ins><span class="cx">
</span><span class="cx"> channel = switch_core_session_get_channel(session);
</span><span class="cx"> switch_assert(channel != NULL);
</span><span class="lines">@@ -948,6 +983,12 @@
</span><span class="cx"> //WARNINGA("read %d samples\n", GSMOPEN_P_LOG, samples);
</span><span class="cx"> }
</span><span class="cx"> #endif// GSMOPEN_ALSA
</span><ins>+#ifdef GSMOPEN_PORTAUDIO
+ while ((samples = gsmopen_portaudio_read(tech_pvt, tmp_buffer, tech_pvt->read_codec.implementation->samples_per_packet * 4)) > 160) {
+ //WARNINGA("read %d samples\n", GSMOPEN_P_LOG, samples);
+ }
+
+#endif// GSMOPEN_PORTAUDIO
</ins><span class="cx"> switch_core_timer_sync(&tech_pvt->timer_read);
</span><span class="cx"> switch_core_timer_sync(&tech_pvt->timer_write);
</span><span class="cx">
</span><span class="lines">@@ -1267,11 +1308,11 @@
</span><span class="cx"> const char *alsa_capture_is_mono = "1";
</span><span class="cx"> const char *capture_boost = "5";
</span><span class="cx"> const char *playback_boost = "10";
</span><del>-#ifdef GSMOPEN_ALSA
</del><ins>+#if defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
</ins><span class="cx"> const char *no_sound = "0";
</span><del>-#else // GSMOPEN_ALSA
</del><ins>+#else
</ins><span class="cx"> const char *no_sound = "1";
</span><del>-#endif // GSMOPEN_ALSA
</del><ins>+#endif // defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
</ins><span class="cx">
</span><span class="cx"> uint32_t interface_id = 0;
</span><span class="cx"> #ifdef WIN32
</span><span class="lines">@@ -1622,11 +1663,11 @@
</span><span class="cx"> #endif// GSMOPEN_ALSA
</span><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].capture_boost = atoi(capture_boost);
</span><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].playback_boost = atoi(playback_boost);
</span><del>-#ifdef GSMOPEN_ALSA
</del><ins>+#if defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
</ins><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].no_sound = atoi(no_sound);
</span><del>-#else // GSMOPEN_ALSA
</del><ins>+#else
</ins><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].no_sound = 1;
</span><del>-#endif // GSMOPEN_ALSA
</del><ins>+#endif // defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1650,6 +1691,17 @@
</span><span class="cx"> #endif// GSMOPEN_ALSA
</span><span class="cx">
</span><span class="cx">
</span><ins>+#ifdef GSMOPEN_PORTAUDIO
+ //FIXME
+ 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;
+ DEBUGA_GSMOPEN("portaudiocindex=%d\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].portaudiocindex);
+ DEBUGA_GSMOPEN("portaudiocindex=%d\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].portaudiocindex);
+ DEBUGA_GSMOPEN("speexecho=%d\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].speexecho);
+ DEBUGA_GSMOPEN("speexpreprocess=%d\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[interface_id].speexpreprocess);
+#endif// GSMOPEN_PORTAUDIO
</ins><span class="cx"> /* init the serial port */
</span><span class="cx"> if (globals.GSMOPEN_INTERFACES[interface_id].controldevprotocol != PROTOCOL_NO_SERIAL) {
</span><span class="cx"> globals.GSMOPEN_INTERFACES[interface_id].controldevfd =
</span><span class="lines">@@ -1683,6 +1735,20 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> #endif// GSMOPEN_ALSA
</span><ins>+#ifdef GSMOPEN_PORTAUDIO
+ if (gsmopen_portaudio_init(&globals.GSMOPEN_INTERFACES[interface_id])) {
+ ERRORA("gsmopen_portaudio_init failed\n", GSMOPEN_P_LOG);
+ return SWITCH_STATUS_FALSE;
+
+ }
+
+ if (gsmopen_portaudio_shutdown(&globals.GSMOPEN_INTERFACES[interface_id])) {
+ ERRORA("gsmopen_portaudio_shutdown failed\n", GSMOPEN_P_LOG);
+ return SWITCH_STATUS_FALSE;
+
+ }
+#endif// GSMOPEN_PORTAUDIO
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> //gsmopen_store_boost((char *)"5", &globals.GSMOPEN_INTERFACES[interface_id].capture_boost); //FIXME
</span><span class="lines">@@ -1724,6 +1790,11 @@
</span><span class="cx"> DEBUGA_GSMOPEN("alsacname=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].alsacname);
</span><span class="cx"> DEBUGA_GSMOPEN("alsapname=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].alsapname);
</span><span class="cx"> #endif// GSMOPEN_ALSA
</span><ins>+#ifdef GSMOPEN_PORTAUDIO
+ DEBUGA_GSMOPEN("portaudiocindex=%d\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].portaudiocindex);
+ DEBUGA_GSMOPEN("portaudiopindex=%d\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].portaudiopindex);
+#endif// GSMOPEN_PORTAUDIO
+
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1870,7 +1941,6 @@
</span><span class="cx">
</span><span class="cx"> for (interface_id = 0; interface_id < GSMOPEN_MAX_INTERFACES; interface_id++) {
</span><span class="cx"> tech_pvt = &globals.GSMOPEN_INTERFACES[interface_id];
</span><del>- WARNINGA("SHUTDOWN interface_id=%d\n", GSMOPEN_P_LOG, interface_id);
</del><span class="cx">
</span><span class="cx"> if (strlen(globals.GSMOPEN_INTERFACES[interface_id].name)) {
</span><span class="cx"> WARNINGA("SHUTDOWN interface_id=%d\n", GSMOPEN_P_LOG, interface_id);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>