Diff
Modified: freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen.h (16257 => 16258)
--- 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)
@@ -75,6 +75,9 @@
#include <alsa/asoundlib.h>
#endif /* GSMOPEN_ALSA */
+#ifdef GSMOPEN_PORTAUDIO
+#include "pablio.h"
+#endif// GSMOPEN_PORTAUDIO
#ifndef WIN32
#include <sys/time.h>
@@ -461,6 +464,15 @@
int no_sound;
+#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
+
};
typedef struct private_object private_t;
@@ -591,3 +603,19 @@
int iso_8859_1_to_utf8(private_t * tech_pvt, char *iso_8859_1_in, char *utf8_out, size_t outbytesleft);
int gsmopen_serial_getstatus_AT(private_t * tech_pvt);
+
+
+#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
Modified: freeswitch/branches/gmaruzz/mod_gsmopen/gsmopen_protocol.cpp (16257 => 16258)
--- 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)
@@ -88,6 +88,319 @@
/***************/
#endif /* WIN32 */
+#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
#ifndef GSMLIBGIO
int gsmopen_serial_init(private_t * tech_pvt, speed_t controldevice_speed)
{
@@ -626,6 +939,10 @@
int at_ack = -1;
int la_read = 0;
+ if(!running || !tech_pvt->running){
+ return -1;
+ }
+
FD_ZERO(&read_fds);
FD_SET(tech_pvt->controldevfd, &read_fds);
@@ -2452,7 +2769,6 @@
-//#define GSMOPEN_ALSA
#ifdef GSMOPEN_ALSA
/*! \brief ALSA pcm format, according to endianess */
#if __BYTE_ORDER == __LITTLE_ENDIAN
@@ -3209,7 +3525,7 @@
{
//char *idest = data;
//char rdest[256];
- //struct gsmopen_pvt *p = NULL;
+ //private_t *p = NULL;
//char *device;
//char *dest;
//char *text;
Modified: freeswitch/branches/gmaruzz/mod_gsmopen/mod_gsmopen.cpp (16257 => 16258)
--- 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)
@@ -276,6 +276,16 @@
}
}
#endif// GSMOPEN_ALSA
+#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
+
if (switch_core_timer_init(&tech_pvt->timer_read, "soft", 20, tech_pvt->read_codec.implementation->samples_per_packet, gsmopen_module_pool) !=
SWITCH_STATUS_SUCCESS) {
ERRORA("setup timer failed\n", GSMOPEN_P_LOG);
@@ -515,7 +525,16 @@
alsa_shutdown(tech_pvt);
}
#endif// GSMOPEN_ALSA
+#ifdef GSMOPEN_PORTAUDIO
+ if(tech_pvt->no_sound==0){
+ if (gsmopen_portaudio_shutdown(tech_pvt)) {
+ ERRORA("gsmopen_portaudio_shutdown failed\n", GSMOPEN_P_LOG);
+ }
+ }
+#endif// GSMOPEN_PORTAUDIO
+
+
*tech_pvt->session_uuid_str = '\0';
tech_pvt->interface_state = GSMOPEN_STATE_IDLE;
if (tech_pvt->phone_callflow == CALLFLOW_STATUS_FINISHED) {
@@ -689,10 +708,10 @@
switch_channel_t *channel = NULL;
private_t *tech_pvt = NULL;
switch_byte_t *data;
-#ifdef GSMOPEN_ALSA
+#if defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
int samples;
char digit_str[256];
-#endif// GSMOPEN_ALSA
+#endif // defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
channel = switch_core_session_get_channel(session);
switch_assert(channel != NULL);
@@ -720,9 +739,15 @@
if(tech_pvt->no_sound==1){
goto cng;
}
+#if defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
#ifdef GSMOPEN_ALSA
//if ((samples = snd_pcm_readi(tech_pvt->alsac, tech_pvt->read_frame.data, tech_pvt->read_codec.implementation->samples_per_packet)) > 0)
- if ((samples = alsa_read(tech_pvt, (short *) tech_pvt->read_frame.data, tech_pvt->read_codec.implementation->samples_per_packet)) > 0) {
+ 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
+ {
tech_pvt->read_frame.datalen = samples * 2;
tech_pvt->read_frame.samples = samples;
@@ -741,6 +766,7 @@
switch_set_flag(tech_pvt, TFLAG_VOICE);
}
+ //WARNINGA("samples=%d\n", GSMOPEN_P_LOG, samples);
if (samples != 160) {
ERRORA("samples=%d\n", GSMOPEN_P_LOG, samples);
goto cng;
@@ -812,7 +838,7 @@
DEBUGA_GSMOPEN("CHANNEL READ FALSE\n", GSMOPEN_P_LOG);
return SWITCH_STATUS_FALSE;
-#endif// GSMOPEN_ALSA
+#endif // defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
cng:
data = (switch_byte_t *) tech_pvt->read_frame.data;
data[0] = 65;
@@ -828,9 +854,9 @@
{
switch_channel_t *channel = NULL;
private_t *tech_pvt = NULL;
-#ifdef GSMOPEN_ALSA
+#if defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
unsigned int sent;
-#endif// GSMOPEN_ALSA
+#endif // defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
channel = switch_core_session_get_channel(session);
switch_assert(channel != NULL);
@@ -868,6 +894,15 @@
DEBUGA_GSMOPEN("sent %d\n", GSMOPEN_P_LOG, sent);
}
#endif// GSMOPEN_ALSA
+#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
//NOTICA("sent=%d\n", GSMOPEN_P_LOG, sent);
return SWITCH_STATUS_SUCCESS;
}
@@ -922,10 +957,10 @@
{
switch_channel_t *channel;
private_t *tech_pvt;
-#ifdef GSMOPEN_ALSA
+#if defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
int samples;
short tmp_buffer[1280];
-#endif// GSMOPEN_ALSA
+#endif // defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
channel = switch_core_session_get_channel(session);
switch_assert(channel != NULL);
@@ -948,6 +983,12 @@
//WARNINGA("read %d samples\n", GSMOPEN_P_LOG, samples);
}
#endif// GSMOPEN_ALSA
+#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
switch_core_timer_sync(&tech_pvt->timer_read);
switch_core_timer_sync(&tech_pvt->timer_write);
@@ -1267,11 +1308,11 @@
const char *alsa_capture_is_mono = "1";
const char *capture_boost = "5";
const char *playback_boost = "10";
-#ifdef GSMOPEN_ALSA
+#if defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
const char *no_sound = "0";
-#else // GSMOPEN_ALSA
+#else
const char *no_sound = "1";
-#endif // GSMOPEN_ALSA
+#endif // defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
uint32_t interface_id = 0;
#ifdef WIN32
@@ -1622,11 +1663,11 @@
#endif// GSMOPEN_ALSA
globals.GSMOPEN_INTERFACES[interface_id].capture_boost = atoi(capture_boost);
globals.GSMOPEN_INTERFACES[interface_id].playback_boost = atoi(playback_boost);
-#ifdef GSMOPEN_ALSA
+#if defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
globals.GSMOPEN_INTERFACES[interface_id].no_sound = atoi(no_sound);
-#else // GSMOPEN_ALSA
+#else
globals.GSMOPEN_INTERFACES[interface_id].no_sound = 1;
-#endif // GSMOPEN_ALSA
+#endif // defined(GSMOPEN_ALSA) || defined(GSMOPEN_PORTAUDIO)
@@ -1650,6 +1691,17 @@
#endif// GSMOPEN_ALSA
+#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
/* init the serial port */
if (globals.GSMOPEN_INTERFACES[interface_id].controldevprotocol != PROTOCOL_NO_SERIAL) {
globals.GSMOPEN_INTERFACES[interface_id].controldevfd =
@@ -1683,6 +1735,20 @@
}
#endif// GSMOPEN_ALSA
+#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
+
}
//gsmopen_store_boost((char *)"5", &globals.GSMOPEN_INTERFACES[interface_id].capture_boost); //FIXME
@@ -1724,6 +1790,11 @@
DEBUGA_GSMOPEN("alsacname=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].alsacname);
DEBUGA_GSMOPEN("alsapname=%s\n", GSMOPEN_P_LOG, globals.GSMOPEN_INTERFACES[i].alsapname);
#endif// GSMOPEN_ALSA
+#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
+
}
}
}
@@ -1870,7 +1941,6 @@
for (interface_id = 0; interface_id < GSMOPEN_MAX_INTERFACES; interface_id++) {
tech_pvt = &globals.GSMOPEN_INTERFACES[interface_id];
- WARNINGA("SHUTDOWN interface_id=%d\n", GSMOPEN_P_LOG, interface_id);
if (strlen(globals.GSMOPEN_INTERFACES[interface_id].name)) {
WARNINGA("SHUTDOWN interface_id=%d\n", GSMOPEN_P_LOG, interface_id);