kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-16 00:41:41 +00:00
Code Issues Projects Releases Wiki Activity

fix codec regression from yesterday

Browse Source
This commit is contained in:
Anthony Minessale 2010-09-30 15:15:33 -05:00
parent 400c785d4e
commit f8c9ef5f9d
3 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/include/switch_utils.h
View File

@ -177,6 +177,23 @@ static inline switch_bool_t switch_is_digit_string(const char *s)
return SWITCH_TRUE; return SWITCH_TRUE;
} }
static inline uint32_t switch_known_bitrate(switch_payload_t payload)
{
switch(payload) {
case 0: /* PCMU */ return 64000;
case 3: /* GSM */ return 13200;
case 4: /* G723 */ return 6300;
case 7: /* LPC */ return 2400;
case 8: /* PCMA */ return 64000;
case 9: /* G722 */ return 64000;
case 18: /* G729 */ return 8000;
default: break;
}
return 0;
}
SWITCH_DECLARE(switch_size_t) switch_fd_read_line(int fd, char *buf, switch_size_t len); SWITCH_DECLARE(switch_size_t) switch_fd_read_line(int fd, char *buf, switch_size_t len);

33
src/mod/endpoints/mod_sofia/sofia_glue.c
View File

@ -4148,8 +4148,6 @@ uint8_t sofia_glue_negotiate_sdp(switch_core_session_t *session, const char *r_s
for (map = m->m_rtpmaps; map; map = map->rm_next) { for (map = m->m_rtpmaps; map; map = map->rm_next) {
int32_t i; int32_t i;
uint32_t near_rate = 0; uint32_t near_rate = 0;
uint32_t near_bit_rate = 0;
switch_codec_interface_t *codec_interface;
const switch_codec_implementation_t *mimp = NULL, *near_match = NULL; const switch_codec_implementation_t *mimp = NULL, *near_match = NULL;
const char *rm_encoding; const char *rm_encoding;
uint32_t map_bit_rate = 0; uint32_t map_bit_rate = 0;
@ -4197,22 +4195,7 @@ uint8_t sofia_glue_negotiate_sdp(switch_core_session_t *session, const char *r_s
ptime = switch_default_ptime(rm_encoding, map->rm_pt); ptime = switch_default_ptime(rm_encoding, map->rm_pt);
} }
/* This will try to use codec specific fmtp parser */ map_bit_rate = switch_known_bitrate(map->rm_pt);
if (map->rm_fmtp && (codec_interface = switch_loadable_module_get_codec_interface(rm_encoding)) != 0) {
switch_codec_fmtp_t codec_fmtp;
memset(&codec_fmtp, '\0', sizeof(struct switch_codec_fmtp));
codec_fmtp.actual_samples_per_second = map->rm_rate;
if (codec_interface->parse_fmtp && codec_interface->parse_fmtp(map->rm_fmtp, &codec_fmtp) == SWITCH_STATUS_SUCCESS) {
if (codec_fmtp.bits_per_second) {
map_bit_rate = codec_fmtp.bits_per_second;
}
if (codec_fmtp.microseconds_per_packet) {
ptime = (codec_fmtp.microseconds_per_packet / 1000);
}
}
UNPROTECT_INTERFACE(codec_interface);
}
if (!codec_ms) { if (!codec_ms) {
codec_ms = ptime; codec_ms = ptime;
@ -4235,19 +4218,19 @@ uint8_t sofia_glue_negotiate_sdp(switch_core_session_t *session, const char *r_s
match = strcasecmp(rm_encoding, imp->iananame) ? 0 : 1; match = strcasecmp(rm_encoding, imp->iananame) ? 0 : 1;
} }
if (match && bit_rate && map_bit_rate && map_bit_rate != bit_rate) {
/* nevermind */
match = 0;
}
if (match) { if (match) {
if (scrooge) { if (scrooge) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
"Bah HUMBUG! Sticking with %s@%uh@%ui\n", "Bah HUMBUG! Sticking with %s@%uh@%ui\n",
imp->iananame, imp->samples_per_second, imp->microseconds_per_packet / 1000); imp->iananame, imp->samples_per_second, imp->microseconds_per_packet / 1000);
} else { } else {
if ((codec_ms && codec_ms * 1000 != imp->microseconds_per_packet) || map->rm_rate != codec_rate || (map_bit_rate && map_bit_rate != bit_rate) ) { if ((codec_ms && codec_ms * 1000 != imp->microseconds_per_packet) || map->rm_rate != codec_rate) {
near_rate = map->rm_rate; near_rate = map->rm_rate;
if (map_bit_rate) {
near_bit_rate = map_bit_rate;
} else {
near_bit_rate = bit_rate;
}
near_match = imp; near_match = imp;
match = 0; match = 0;
continue; continue;
@ -4260,7 +4243,7 @@ uint8_t sofia_glue_negotiate_sdp(switch_core_session_t *session, const char *r_s
} }
} }
if (!match && near_match && !map->rm_next) { if (!match && near_match) {
const switch_codec_implementation_t *search[1]; const switch_codec_implementation_t *search[1];
char *prefs[1]; char *prefs[1];
char tmp[80]; char tmp[80];

10
src/switch_loadable_module.c
View File

@ -183,8 +183,9 @@ static switch_status_t switch_loadable_module_process(char *key, switch_loadable
if (load_interface) { if (load_interface) {
for (impl = ptr->implementations; impl; impl = impl->next) { for (impl = ptr->implementations; impl; impl = impl->next) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE,
"Adding Codec '%s' (%s) %dhz %dms %dbps\n", "Adding Codec %s %d %s %dhz %dms %dbps\n",
impl->iananame, ptr->interface_name, impl->actual_samples_per_second, impl->microseconds_per_packet / 1000, impl->bits_per_second); impl->iananame, impl->ianacode,
ptr->interface_name, impl->actual_samples_per_second, impl->microseconds_per_packet / 1000, impl->bits_per_second);
if (!switch_core_hash_find(loadable_modules.codec_hash, impl->iananame)) { if (!switch_core_hash_find(loadable_modules.codec_hash, impl->iananame)) {
switch_core_hash_insert(loadable_modules.codec_hash, impl->iananame, (const void *) ptr); switch_core_hash_insert(loadable_modules.codec_hash, impl->iananame, (const void *) ptr);
} }
@ -515,8 +516,9 @@ static switch_status_t switch_loadable_module_unprocess(switch_loadable_module_t
if (load_interface) { if (load_interface) {
for (impl = ptr->implementations; impl; impl = impl->next) { for (impl = ptr->implementations; impl; impl = impl->next) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE,
"Deleting Codec '%s' (%s) %dhz %dms\n", "Deleting Codec %s %d %s %dhz %dms\n",
impl->iananame, ptr->interface_name, impl->actual_samples_per_second, impl->microseconds_per_packet / 1000); impl->iananame, impl->ianacode,
ptr->interface_name, impl->actual_samples_per_second, impl->microseconds_per_packet / 1000);
switch_core_session_hupall_matching_var("read_codec", impl->iananame, SWITCH_CAUSE_MANAGER_REQUEST); switch_core_session_hupall_matching_var("read_codec", impl->iananame, SWITCH_CAUSE_MANAGER_REQUEST);
switch_core_session_hupall_matching_var("write_codec", impl->iananame, SWITCH_CAUSE_MANAGER_REQUEST); switch_core_session_hupall_matching_var("write_codec", impl->iananame, SWITCH_CAUSE_MANAGER_REQUEST);
if (switch_core_hash_find(loadable_modules.codec_hash, impl->iananame)) { if (switch_core_hash_find(loadable_modules.codec_hash, impl->iananame)) {