ben.carrasco/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-07-24 21:22:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

gsmopen: windows again, back to linux

Browse Source
This commit is contained in:
Giovanni Maruzzelli
2012-04-06 18:59:51 +02:00
parent eaa37c3e41
commit 35d8aa44f8
3 changed files with 67 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mod/endpoints/mod_gsmopen/mod_gsmopen.cpp
+43 -8
View File
@@ -810,7 +810,7 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
int samples;
int samples2;
char digit_str[256];
short buffer2[640];
char buffer2[640];
channel = switch_core_session_get_channel(session);
@@ -842,9 +842,23 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
//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)
#endif// GSMOPEN_ALSA
if ((samples = tech_pvt->serialPort_serial_audio->Read((char *) tech_pvt->read_frame.data, 320)) >0)
{
// if ((samples = tech_pvt->serialPort_serial_audio->Read((char *) tech_pvt->read_frame.data, 320)) >0)
if ((samples = tech_pvt->serialPort_serial_audio->Read(buffer2, 640)) >= 320)
{
tech_pvt->buffer2_full = 0;
if(samples >= 640){
DEBUGA_GSMOPEN("samples=%d\n", GSMOPEN_P_LOG, samples);
memcpy(tech_pvt->buffer2, buffer2+320, 320);
tech_pvt->buffer2_full = 1;
}
samples=320;
memcpy(tech_pvt->read_frame.data, buffer2, 320);
tech_pvt->read_frame.datalen = samples;
tech_pvt->read_frame.samples = samples/2;
@@ -852,14 +866,35 @@ static switch_status_t channel_read_frame(switch_core_session_t *session, switch
*frame = &tech_pvt->read_frame;
if ((samples2 = tech_pvt->serialPort_serial_audio->Read((char *) tech_pvt->read_frame.data, 320)) >0){
WARNINGA("samples2=%d\n", GSMOPEN_P_LOG, samples2);
}
//if ((samples2 = tech_pvt->serialPort_serial_audio->Read((char *) tech_pvt->read_frame.data, 320)) >0){
// WARNINGA("samples2=%d\n", GSMOPEN_P_LOG, samples2);
//}
//status = SWITCH_STATUS_SUCCESS;
switch_set_flag(tech_pvt, TFLAG_VOICE);
}
}else{
DEBUGA_GSMOPEN("MINGA samples=%d\n", GSMOPEN_P_LOG, samples);
if(tech_pvt->buffer2_full){
memcpy(tech_pvt->read_frame.data, tech_pvt->buffer2, 320);
tech_pvt->buffer2_full = 0;
samples=320;
DEBUGA_GSMOPEN("samples=%d FROM BUFFER\n", GSMOPEN_P_LOG, samples);
tech_pvt->read_frame.datalen = samples;
tech_pvt->read_frame.samples = samples/2;
tech_pvt->read_frame.timestamp = tech_pvt->timer_read.samplecount;
*frame = &tech_pvt->read_frame;
//if ((samples2 = tech_pvt->serialPort_serial_audio->Read((char *) tech_pvt->read_frame.data, 320)) >0){
// WARNINGA("samples2=%d\n", GSMOPEN_P_LOG, samples2);
//}
//status = SWITCH_STATUS_SUCCESS;
switch_set_flag(tech_pvt, TFLAG_VOICE);
}
}
//WARNINGA("samples=%d\n", GSMOPEN_P_LOG, samples);
if (samples != 320) {
DEBUGA_GSMOPEN("samples=%d\n", GSMOPEN_P_LOG, samples);