retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-9638 passing codec through on unanswered channels too (late neg)

This commit is contained in:
Anthony Minessale 2016-11-14 11:34:56 -06:00
parent 421edacc06
commit 3b50883734
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/switch_core_media.c
View File

@ -12426,6 +12426,12 @@ static void switch_core_media_set_r_sdp_codec_string(switch_core_session_t *sess
}
}
}
} else if (m->m_proto == sdp_proto_msrp) {
switch_channel_set_flag(channel, CF_WANT_MSRP);
} else if (m->m_proto == sdp_proto_msrps) {
switch_channel_set_flag(channel, CF_WANT_MSRPS);
} else if (m->m_type == sdp_media_text) {
switch_channel_set_flag(channel, CF_WANT_RTT);
}
}

12
src/switch_core_session.c
View File

@ -647,7 +647,7 @@ SWITCH_DECLARE(switch_call_cause_t) switch_core_session_outgoing_channel(switch_
if (channel) {
const char *val;
switch_codec_t *vid_read_codec = NULL, *read_codec = switch_core_session_get_read_codec(session);
const char *ep, *max_forwards = switch_core_session_sprintf(session, "%d", forwardval);
const char *ep = NULL, *max_forwards = switch_core_session_sprintf(session, "%d", forwardval);
switch_channel_set_variable(peer_channel, SWITCH_MAX_FORWARDS_VARIABLE, max_forwards);
@ -655,6 +655,8 @@ SWITCH_DECLARE(switch_call_cause_t) switch_core_session_outgoing_channel(switch_
vid_read_codec = switch_core_session_get_video_read_codec(session);
ep = switch_channel_get_variable(channel, "ep_codec_string");
if (read_codec && read_codec->implementation && switch_core_codec_ready(read_codec)) {
char rc[80] = "", vrc[80] = "", tmp[160] = "";
@ -667,18 +669,18 @@ SWITCH_DECLARE(switch_call_cause_t) switch_core_session_outgoing_channel(switch_
switch_snprintf(tmp, sizeof(tmp), "%s%s", rc, vrc);
switch_channel_set_variable(peer_channel, SWITCH_ORIGINATOR_CODEC_VARIABLE, tmp);
} else if ((ep = switch_channel_get_variable(channel, "ep_codec_string"))) {
} else if (ep) {
switch_channel_set_variable(peer_channel, SWITCH_ORIGINATOR_CODEC_VARIABLE, ep);
}
if (switch_channel_test_flag(channel, CF_MSRPS)) {
if (switch_channel_test_flag(channel, CF_MSRPS) || switch_channel_test_flag(channel, CF_WANT_MSRPS)) {
switch_channel_set_flag(peer_channel, CF_WANT_MSRPS);
} else if (switch_channel_test_flag(channel, CF_MSRP)) {
} else if (switch_channel_test_flag(channel, CF_MSRP) || switch_channel_test_flag(channel, CF_WANT_MSRP)) {
switch_channel_set_flag(peer_channel, CF_WANT_MSRP);
}
if (switch_channel_test_flag(channel, CF_RTT)) {
if (switch_channel_test_flag(channel, CF_RTT) || switch_channel_test_flag(channel, CF_WANT_RTT)) {
switch_channel_set_flag(peer_channel, CF_WANT_RTT);
}