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

Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch

This commit is contained in:
Chris Rienzo 2014-01-30 13:10:10 -05:00
parent 5891951ea9 6bec36168c
commit 9fdf803fe8
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/switch_core_media.c
View File

@ -1349,7 +1349,7 @@ SWITCH_DECLARE(void) switch_core_media_prepare_codecs(switch_core_session_t *ses
return; return;
} }
if (switch_channel_test_flag(session->channel, CF_PROXY_MODE) || switch_channel_test_flag(session->channel, CF_PROXY_MEDIA)) { if (!force && (switch_channel_test_flag(session->channel, CF_PROXY_MODE) || switch_channel_test_flag(session->channel, CF_PROXY_MEDIA))) {
return; return;
} }
@ -2672,7 +2672,7 @@ static void clear_pmaps(switch_rtp_engine_t *engine)
{ {
payload_map_t *pmap; payload_map_t *pmap;
for (pmap = engine->cur_payload_map; pmap && pmap->allocated; pmap = pmap->next) { for (pmap = engine->payload_map; pmap && pmap->allocated; pmap = pmap->next) {
pmap->negotiated = 0; pmap->negotiated = 0;
} }
} }
@ -7479,6 +7479,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_receive_message(switch_core_se
switch_channel_set_flag(session->channel, CF_PROXY_MODE); switch_channel_set_flag(session->channel, CF_PROXY_MODE);
a_engine->codec_negotiated = 0; a_engine->codec_negotiated = 0;
v_engine->codec_negotiated = 0;
switch_core_media_set_local_sdp(session, NULL, SWITCH_FALSE); switch_core_media_set_local_sdp(session, NULL, SWITCH_FALSE);
@ -7493,15 +7494,19 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_receive_message(switch_core_se
ip = switch_channel_get_variable(other_channel, SWITCH_REMOTE_MEDIA_IP_VARIABLE); ip = switch_channel_get_variable(other_channel, SWITCH_REMOTE_MEDIA_IP_VARIABLE);
port = switch_channel_get_variable(other_channel, SWITCH_REMOTE_MEDIA_PORT_VARIABLE); port = switch_channel_get_variable(other_channel, SWITCH_REMOTE_MEDIA_PORT_VARIABLE);
switch_core_session_rwunlock(other_session); switch_core_session_rwunlock(other_session);
if (ip && port) { if (ip && port) {
switch_core_media_prepare_codecs(session, 1);
clear_pmaps(a_engine);
clear_pmaps(v_engine);
switch_core_media_gen_local_sdp(session, SDP_TYPE_REQUEST, ip, (switch_port_t)atoi(port), NULL, 1); switch_core_media_gen_local_sdp(session, SDP_TYPE_REQUEST, ip, (switch_port_t)atoi(port), NULL, 1);
} }
} }
//if (!smh->mparams->local_sdp_str) { if (!smh->mparams->local_sdp_str) {
switch_core_media_absorb_sdp(session); switch_core_media_absorb_sdp(session);
//} }
} }
break; break;