kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

include latest debug things 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@9445 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Antonio Gallo 2008-09-04 16:25:24 +00:00
parent 31351e8c9d
commit 3e3c7c9b70
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/mod/applications/mod_fax/mod_fax.c
View File

@ -220,14 +220,14 @@ void process_fax(switch_core_session_t *session, char *data, int calling_party)
{ {
switch_channel_t *channel; switch_channel_t *channel;
switch_codec_t *orig_read_codec = NULL; switch_codec_t *orig_read_codec = NULL;
switch_codec_t *orig_write_codec = NULL;
switch_codec_t read_codec = {0}; switch_codec_t read_codec = {0};
switch_codec_t write_codec = {0}; switch_codec_t write_codec = {0};
switch_frame_t *read_frame = {0}; switch_frame_t *read_frame = {0};
switch_frame_t write_frame = {0}; switch_frame_t write_frame = {0};
switch_status_t status; switch_status_t status;
fax_state_t fax; fax_state_t fax;
int16_t buf[512]; #define FAX_BUFFER_SIZE 4096
int16_t buf[FAX_BUFFER_SIZE]; //TODO original value: 512
int tx = 0; int tx = 0;
/*TODO: int calling_party = FALSE; DEPRECATED */ /*TODO: int calling_party = FALSE; DEPRECATED */
/* Channels variable parsing */ /* Channels variable parsing */
@ -378,14 +378,11 @@ void process_fax(switch_core_session_t *session, char *data, int calling_party)
goto done; goto done;
} }
// NEW
orig_write_codec = switch_core_session_get_write_codec(session);
if (switch_core_codec_init(&write_codec, if (switch_core_codec_init(&write_codec,
"L16", "L16",
NULL, NULL,
orig_write_codec->implementation->samples_per_second, orig_read_codec->implementation->samples_per_second,
orig_write_codec->implementation->microseconds_per_frame / 1000, orig_read_codec->implementation->microseconds_per_frame / 1000,
1, 1,
SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
NULL, NULL,
@ -412,14 +409,24 @@ void process_fax(switch_core_session_t *session, char *data, int calling_party)
goto done; goto done;
} }
//DEBUG switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Frame Read: %d\n" , read_frame->samples);
/* pass the new incoming audio frame to the fax_rx application */ /* pass the new incoming audio frame to the fax_rx application */
fax_rx(&fax, (int16_t *)read_frame->data, read_frame->samples); if( fax_rx(&fax, (int16_t *)read_frame->data, read_frame->samples) ) {
//TODO
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "FAX_RX error\n" );
}
//TODO
if (read_frame->samples > 256 )
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "SAMPLES TOO BIG\n" );
if ((tx = fax_tx(&fax, (int16_t *) &buf, write_codec.implementation->samples_per_frame)) < 0) { if ((tx = fax_tx(&fax, (int16_t *) &buf, write_codec.implementation->samples_per_frame)) < 0) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Fax Error\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Fax_Tx Error\n");
goto done; goto done;
} }
//DEBUG switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fax Tx : %d %d\n" , tx, write_codec.implementation->samples_per_frame);
if (tx) { if (tx!=0) {
write_frame.datalen = tx * sizeof(int16_t); write_frame.datalen = tx * sizeof(int16_t);
write_frame.samples = tx; write_frame.samples = tx;
@ -430,6 +437,10 @@ void process_fax(switch_core_session_t *session, char *data, int calling_party)
); );
goto done; goto done;
} }
//DEBUG switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Frame TX : %d %d\n" , write_frame.datalen, write_frame.samples);
} else {
// TODO
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "non trasmitting\n" );
} }
} }
@ -456,10 +467,6 @@ void process_fax(switch_core_session_t *session, char *data, int calling_party)
switch_core_session_set_read_codec(session, orig_read_codec); switch_core_session_set_read_codec(session, orig_read_codec);
} }
if (orig_write_codec) {
switch_core_session_set_write_codec(session, orig_write_codec);
}
} }
SWITCH_STANDARD_APP(txfax_function) SWITCH_STANDARD_APP(txfax_function)