kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-22 03:51:48 +00:00
Code Issues Projects Releases Wiki Activity

mod_sangoma_codec: Accept Comfort Noise IANA

Browse Source 
Default to silence suppression turned off
                   Check for root user
This commit is contained in:
Moises Silva 2010-06-14 19:24:57 -04:00
parent e0f7c2e320
commit beca1423d5
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/mod/codecs/mod_sangoma_codec/mod_sangoma_codec.c
View File

@ -110,6 +110,9 @@ vocallo_codec_t g_codec_map[] =
{ -1, -1, NULL, NULL, -1, -1, -1, -1, -1, -1 }, { -1, -1, NULL, NULL, -1, -1, -1, -1, -1, -1 },
}; };
/* RFC3389 RTP Payload for Comfort Noise */
#define IANACODE_CN 13
/* default codec list to load, users may override, special codec 'all' registers everything available unless listed in noregister */ /* default codec list to load, users may override, special codec 'all' registers everything available unless listed in noregister */
static char g_codec_register_list[1024] = "all"; static char g_codec_register_list[1024] = "all";
@ -268,19 +271,19 @@ static switch_status_t switch_sangoma_init(switch_codec_t *codec, switch_codec_f
if (encoding) { if (encoding) {
sess->encoder.request.usr_priv = sess; sess->encoder.request.usr_priv = sess;
sess->encoder.request.a.codec_id = SNGTC_CODEC_PCMU; sess->encoder.request.a.codec_id = SNGTC_CODEC_PCMU;
sess->encoder.request.a.ms = codec->implementation->microseconds_per_packet/1000; sess->encoder.request.a.ms = 0; /*codec->implementation->microseconds_per_packet/1000;*/
sess->encoder.request.b.codec_id = vcodec->codec_id; sess->encoder.request.b.codec_id = vcodec->codec_id;
sess->encoder.request.b.ms = codec->implementation->microseconds_per_packet/1000; sess->encoder.request.b.ms = 0; /*codec->implementation->microseconds_per_packet/1000;*/
} }
if (decoding) { if (decoding) {
sess->decoder.request.usr_priv = sess; sess->decoder.request.usr_priv = sess;
sess->decoder.request.a.codec_id = vcodec->codec_id; sess->decoder.request.a.codec_id = vcodec->codec_id;
sess->decoder.request.a.ms = codec->implementation->microseconds_per_packet/1000; sess->decoder.request.a.ms = 0; /*codec->implementation->microseconds_per_packet/1000;*/
sess->decoder.request.b.codec_id = SNGTC_CODEC_PCMU; sess->decoder.request.b.codec_id = SNGTC_CODEC_PCMU;
sess->decoder.request.b.ms = codec->implementation->microseconds_per_packet/1000; sess->decoder.request.b.ms = 0; /*codec->implementation->microseconds_per_packet/1000;*/
} }
@ -400,7 +403,8 @@ static switch_status_t switch_sangoma_encode(switch_codec_t *codec, switch_codec
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
if (encoded_frame.payload != codec->implementation->ianacode) { if (encoded_frame.payload != codec->implementation->ianacode
&& encoded_frame.payload != IANACODE_CN) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Read unexpected payload %d in Sangoma encoder RTP session, expecting %d\n", switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Read unexpected payload %d in Sangoma encoder RTP session, expecting %d\n",
encoded_frame.payload, codec->implementation->ianacode); encoded_frame.payload, codec->implementation->ianacode);
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
@ -512,7 +516,8 @@ static switch_status_t switch_sangoma_decode(switch_codec_t *codec, /* codec ses
return SWITCH_STATUS_SUCCESS; return SWITCH_STATUS_SUCCESS;
} }
if (ulaw_frame.payload != IANA_ULAW) { if (ulaw_frame.payload != IANA_ULAW
&& ulaw_frame.payload != IANACODE_CN) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Read unexpected payload %d in Sangoma decoder RTP session, expecting %d\n", switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Read unexpected payload %d in Sangoma decoder RTP session, expecting %d\n",
ulaw_frame.payload, IANA_ULAW); ulaw_frame.payload, IANA_ULAW);
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;
@ -883,7 +888,7 @@ static int sangoma_parse_config(void)
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Configuring vocallo %s\n", name); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Configuring vocallo %s\n", name);
g_init_cfg.host_nic_vocallo_cfg[vidx].vocallo_base_udp_port = SANGOMA_DEFAULT_UDP_PORT; g_init_cfg.host_nic_vocallo_cfg[vidx].vocallo_base_udp_port = SANGOMA_DEFAULT_UDP_PORT;
g_init_cfg.host_nic_vocallo_cfg[vidx].silence_suppression = 1; g_init_cfg.host_nic_vocallo_cfg[vidx].silence_suppression = 0;
for (param = switch_xml_child(vocallo, "param"); param; param = param->next) { for (param = switch_xml_child(vocallo, "param"); param; param = param->next) {
char *var = (char *)switch_xml_attr_soft(param, "name"); char *var = (char *)switch_xml_attr_soft(param, "name");
char *val = (char *)switch_xml_attr_soft(param, "value"); char *val = (char *)switch_xml_attr_soft(param, "value");
@ -971,6 +976,13 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_sangoma_codec_load)
g_init_cfg.create_rtp = sangoma_create_rtp; g_init_cfg.create_rtp = sangoma_create_rtp;
g_init_cfg.destroy_rtp = sangoma_destroy_rtp; g_init_cfg.destroy_rtp = sangoma_destroy_rtp;
#ifdef __linux__
if (geteuid() != 0) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "This module needs to be run as root to create raw sockets\n");
return SWITCH_STATUS_FALSE;
}
#endif
if (sngtc_detect_init_modules(&g_init_cfg, &detected)) { if (sngtc_detect_init_modules(&g_init_cfg, &detected)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to detect vocallo modules\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to detect vocallo modules\n");
return SWITCH_STATUS_FALSE; return SWITCH_STATUS_FALSE;