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

update

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@871 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale
2006-03-18 04:04:59 +00:00
parent bef74390f5
commit cefb356398
5 changed files with 65 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mod/codecs/mod_g729/mod_g729.c
+11 -5
View File
@@ -57,7 +57,7 @@ static switch_status switch_g729_init(switch_codec *codec, switch_codec_flag fla
} else {
if (encoding) {
g729_init_coder(&context->encoder_object, 1);
g729_init_coder(&context->encoder_object, 0);
}
if (decoding) {
@@ -121,6 +121,7 @@ static switch_status switch_g729_encode(switch_codec *codec,
return SWITCH_STATUS_FALSE;
}
}
return SWITCH_STATUS_SUCCESS;
}
@@ -144,7 +145,6 @@ static switch_status switch_g729_decode(switch_codec *codec,
int plen = 10;
if (!context) {
return SWITCH_STATUS_FALSE;
}
@@ -165,6 +165,7 @@ static switch_status switch_g729_decode(switch_codec *codec,
}
if (encoded_data_len % divisor == 0) {
uint8_t *test;
int loops = (int) encoded_data_len / divisor;
@@ -176,6 +177,13 @@ static switch_status switch_g729_decode(switch_codec *codec,
unsigned int new_len = 0;
test = (uint8_t *) encoded_data;
if (*test == 0 && *(test+1) == 0) {
*decoded_data_len = (encoded_data_len / divisor) * 160;
memset(decoded_data, 0, *decoded_data_len);
return SWITCH_STATUS_SUCCESS;
}
for (x = 0; x < loops && new_len < *decoded_data_len; x++) {
g729_decoder(&context->decoder_object, ddp, edp, plen);
@@ -191,13 +199,11 @@ static switch_status switch_g729_decode(switch_codec *codec,
} else {
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "buffer overflow!!!\n");
return SWITCH_STATUS_FALSE;
}
}
} else {
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "yo this frame is an odd size [%d]\n", encoded_data_len);
return SWITCH_STATUS_FALSE;
}
@@ -237,7 +243,7 @@ static const switch_codec_implementation g729_8k_implementation = {
/*.encoded_bytes_per_frame */ 20,
/*.number_of_channels */ 1,
/*.pref_frames_per_packet */ 1,
/*.max_frames_per_packet */ 24,
/*.max_frames_per_packet */ 1,
/*.init */ switch_g729_init,
/*.encode */ switch_g729_encode,
/*.decode */ switch_g729_decode,
src/mod/codecs/mod_l16/mod_l16.c
+2 -2
View File
@@ -59,7 +59,7 @@ static switch_status switch_raw_encode(switch_codec *codec,
{
/* NOOP indicates that the audio in is already the same as the audio out, so no conversion was necessary. */
if (codec->implementation->samples_per_second != other_codec->implementation->samples_per_second) {
if (codec && other_codec && codec->implementation->samples_per_second != other_codec->implementation->samples_per_second) {
memcpy(encoded_data, decoded_data, decoded_data_len);
*encoded_data_len = decoded_data_len;
return SWITCH_STATUS_RESAMPLE;
@@ -75,7 +75,7 @@ static switch_status switch_raw_decode(switch_codec *codec,
void *decoded_data,
size_t *decoded_data_len, int *decoded_rate, unsigned int *flag)
{
if (codec->implementation->samples_per_second != other_codec->implementation->samples_per_second) {
if (codec && other_codec && codec->implementation->samples_per_second != other_codec->implementation->samples_per_second) {
memcpy(decoded_data, encoded_data, encoded_data_len);
*decoded_data_len = encoded_data_len;
return SWITCH_STATUS_RESAMPLE;
src/mod/endpoints/mod_wanpipe/mod_wanpipe.c
+31 -10
View File
@@ -224,10 +224,11 @@ static switch_status wanpipe_on_init(switch_core_session *session)
{
struct private_object *tech_pvt;
switch_channel *channel = NULL;
wanpipe_tdm_api_t tdm_api;
wanpipe_tdm_api_t tdm_api = {};
int err = 0;
int mtu_mru;
unsigned int rate = 8000;
int new_mtu = ((globals.mtu / 8) / 2);
channel = switch_core_session_get_channel(session);
assert(channel != NULL);
@@ -238,13 +239,20 @@ static switch_status wanpipe_on_init(switch_core_session *session)
tech_pvt->read_frame.data = tech_pvt->databuf;
err = sangoma_tdm_set_codec(tech_pvt->socket, &tdm_api, WP_SLINEAR);
mtu_mru = sangoma_tdm_get_usr_mtu_mru(tech_pvt->socket, &tdm_api);
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "WANPIPE INIT MTU is %d\n", mtu_mru);
if (mtu_mru != globals.mtu) {
sangoma_tdm_set_usr_period(tech_pvt->socket, &tdm_api, (globals.mtu / 8) / 2);
sangoma_tdm_set_usr_period(tech_pvt->socket, &tdm_api, 40);
err = sangoma_tdm_set_usr_period(tech_pvt->socket, &tdm_api, new_mtu);
mtu_mru = sangoma_tdm_get_usr_mtu_mru(tech_pvt->socket, &tdm_api);
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "ADJUSTED MTU is %d\n", mtu_mru);
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "ADJUSTED MTU AFTER SETTING IT TO %d is %d %d [%s]\n", new_mtu, mtu_mru, err, strerror(err));
if (mtu_mru != globals.mtu) {
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Failure to adjust MTU\n");
switch_channel_hangup(channel);
return SWITCH_STATUS_FALSE;
}
}
if (switch_core_codec_init
@@ -287,6 +295,10 @@ static switch_status wanpipe_on_init(switch_core_session *session)
teletone_dtmf_detect_init (&tech_pvt->dtmf_detect, rate);
if (switch_test_flag(tech_pvt, TFLAG_NOSIG)) {
switch_channel_answer(channel);
}
/* Move Channel's State Machine to RING */
switch_channel_set_state(channel, CS_RING);
@@ -366,6 +378,17 @@ static switch_status wanpipe_on_loopback(switch_core_session *session)
static switch_status wanpipe_on_transmit(switch_core_session *session)
{
struct private_object *tech_pvt;
switch_channel *channel;
channel = switch_core_session_get_channel(session);
assert(channel != NULL);
tech_pvt = switch_core_session_get_private(session);
assert(tech_pvt != NULL);
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "WANPIPE TRANSMIT\n");
return SWITCH_STATUS_SUCCESS;
}
@@ -461,7 +484,6 @@ static switch_status wanpipe_outgoing_channel(switch_core_session *session, swit
return SWITCH_STATUS_GENERR;
}
switch_set_flag(tech_pvt, TFLAG_NOSIG);
switch_channel_answer(channel);
} else {
switch_console_printf(SWITCH_CHANNEL_CONSOLE, "Invalid address\n");
switch_core_session_destroy(new_session);
@@ -634,8 +656,8 @@ static switch_status wanpipe_read_frame(switch_core_session *session, switch_fra
}
}
if (tech_pvt->skip_read_frames) {
memset(tech_pvt->read_frame.data, 255, tech_pvt->read_frame.datalen);
if (tech_pvt->skip_read_frames > 0) {
memset(tech_pvt->read_frame.data, 0, tech_pvt->read_frame.datalen);
tech_pvt->skip_read_frames--;
}
@@ -666,8 +688,6 @@ static switch_status wanpipe_write_frame(switch_core_session *session, switch_fr
assert(tech_pvt != NULL);
//printf("write %d\n", frame->datalen);
while (tech_pvt->dtmf_buffer && bwrote < frame->datalen && bytes > 0 && (inuse = switch_buffer_inuse(tech_pvt->dtmf_buffer)) > 0) {
if ((bread = switch_buffer_read(tech_pvt->dtmf_buffer, dtmf, globals.mtu)) < globals.mtu) {
while (bread < globals.mtu) {
@@ -712,7 +732,7 @@ static switch_status wanpipe_write_frame(switch_core_session *session, switch_fr
write(tech_pvt->fd, bp, (int) globals.mtu);
#endif
towrite = bytes >= globals.mtu ? globals.mtu : bytes;
//printf("write %d\n", towrite);
res = sangoma_sendmsg_socket(tech_pvt->socket,
&tech_pvt->hdrframe, sizeof(tech_pvt->hdrframe), bp, towrite, 0);
if (res < 0) {
@@ -731,7 +751,8 @@ static switch_status wanpipe_write_frame(switch_core_session *session, switch_fr
res = 0;
}
}
//printf("write %d %d\n", frame->datalen, status);
return status;
}