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

Merge pull request #399 in FS/freeswitch from ~DRAGOS_OANCEA/freeswitch-dragos:telephone-event--adv_rm_rate-fix2 to master 

* commit 'a0a43ab1eeef126031c6767b868d58ee7a5612ae':
  FS-7971 : adv_rm_rate (telephone-event and CN)
This commit is contained in:
Mike Jerris 2015-08-19 13:40:20 -05:00
parent c52969fcf9 a0a43ab1ee
commit 283685844e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/switch_core_media.c
View File

@ -4341,7 +4341,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
} }
if (!strcasecmp(rm_encoding, "telephone-event")) { if (!strcasecmp(rm_encoding, "telephone-event")) {
if (!best_te || map->rm_rate == a_engine->cur_payload_map->rm_rate) { if (!best_te || map->rm_rate == a_engine->cur_payload_map->adv_rm_rate) {
best_te = (switch_payload_t) map->rm_pt; best_te = (switch_payload_t) map->rm_pt;
best_te_rate = map->rm_rate; best_te_rate = map->rm_rate;
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Set telephone-event payload to %u@%lu\n", best_te, best_te_rate); switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Set telephone-event payload to %u@%lu\n", best_te, best_te_rate);
@ -4351,7 +4351,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
if (!switch_media_handle_test_media_flag(smh, SCMF_SUPPRESS_CNG) && !strcasecmp(rm_encoding, "CN")) { if (!switch_media_handle_test_media_flag(smh, SCMF_SUPPRESS_CNG) && !strcasecmp(rm_encoding, "CN")) {
if (!cng_pt || map->rm_rate == a_engine->cur_payload_map->rm_rate) { if (!cng_pt || map->rm_rate == a_engine->cur_payload_map->adv_rm_rate) {
cng_pt = (switch_payload_t) map->rm_pt; cng_pt = (switch_payload_t) map->rm_pt;
cng_rate = map->rm_rate; cng_rate = map->rm_rate;