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

FS-5933 --resolve

This commit is contained in:
Anthony Minessale 2013-10-31 11:37:46 -05:00
parent 460b8014b9
commit a7dab0464d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/switch_core_media.c
View File

@ -3033,19 +3033,21 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
"Bah HUMBUG! Sticking with %s@%uh@%ui\n",
imp->iananame, imp->samples_per_second, imp->microseconds_per_packet / 1000);
} else if (!near_match) {
if ((ptime && codec_ms && codec_ms * 1000 != imp->microseconds_per_packet) || map->rm_rate != codec_rate) {
} else if ((ptime && codec_ms && codec_ms * 1000 != imp->microseconds_per_packet) || map->rm_rate != codec_rate) {
/* ptime does not match */
match = 0;
/* save first near_match */
if (!near_match) {
near_rate = map->rm_rate;
near_match = imp;
near_map = mmap = map;
match = 0;
if (switch_true(switch_channel_get_variable_dup(channel, "rtp_negotiate_near_match", SWITCH_FALSE, -1))) {
goto near_match;
}
continue;
}
continue;
}
mimp = imp;
mmap = map;
@ -3080,10 +3082,8 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
if (num) {
mimp = search[0];
mmap = map;
} else {
mimp = near_match;
mmap = map;
}
if (!maxptime || mimp->microseconds_per_packet / 1000 <= maxptime) {