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

fix FS-5116 the new way

This commit is contained in:
Anthony Minessale 2013-02-21 16:04:04 -06:00
parent 3201478830
commit ee1b4db480
1 changed files with 4 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

@ -1735,6 +1735,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_set_codec(switch_core_session_
if (switch_rtp_ready(a_engine->rtp_session)) { if (switch_rtp_ready(a_engine->rtp_session)) {
switch_rtp_set_default_payload(a_engine->rtp_session, a_engine->codec_params.pt); switch_rtp_set_default_payload(a_engine->rtp_session, a_engine->codec_params.pt);
switch_rtp_set_recv_pt(a_engine->rtp_session, a_engine->read_codec.agreed_pt);
} }
end: end:
@ -2105,7 +2106,6 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
a_engine = &smh->engines[SWITCH_MEDIA_TYPE_AUDIO]; a_engine = &smh->engines[SWITCH_MEDIA_TYPE_AUDIO];
v_engine = &smh->engines[SWITCH_MEDIA_TYPE_VIDEO]; v_engine = &smh->engines[SWITCH_MEDIA_TYPE_VIDEO];
codec_array = smh->codecs; codec_array = smh->codecs;
total_codecs = smh->mparams->num_codecs; total_codecs = smh->mparams->num_codecs;
@ -6312,6 +6312,8 @@ SWITCH_DECLARE(switch_status_t) switch_core_media_receive_message(switch_core_se
switch_core_media_gen_local_sdp(session, NULL, 0, NULL, 1); switch_core_media_gen_local_sdp(session, NULL, 0, NULL, 1);
} }
switch_media_handle_set_media_flag(smh, SCMF_RENEG_ON_REINVITE);
if (msg->numeric_arg && switch_core_session_get_partner(session, &nsession) == SWITCH_STATUS_SUCCESS) { if (msg->numeric_arg && switch_core_session_get_partner(session, &nsession) == SWITCH_STATUS_SUCCESS) {
msg->numeric_arg = 0; msg->numeric_arg = 0;
switch_core_session_receive_message(nsession, msg); switch_core_session_receive_message(nsession, msg);