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

FS-7456: also more complete fix for FS-7440, handle sdp with m lines in any order

This commit is contained in:
Michael Jerris 2015-04-21 11:06:46 -05:00
parent 777c1154ee
commit 9d68cab2ac
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/switch_core_media.c
View File

@ -3404,6 +3404,11 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
sdp_rtpmap_t *map; sdp_rtpmap_t *map;
int ice = 0; int ice = 0;
nm_idx = 0;
m_idx = 0;
memset(matches, 0, sizeof(matches[0]) * MAX_MATCHES);
memset(near_matches, 0, sizeof(near_matches[0]) * MAX_MATCHES);
if (!sendonly && (m->m_mode == sdp_sendonly || m->m_mode == sdp_inactive)) { if (!sendonly && (m->m_mode == sdp_sendonly || m->m_mode == sdp_inactive)) {
sendonly = 1; sendonly = 1;
} }
@ -3797,12 +3802,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
smh->num_negotiated_codecs = 0; smh->num_negotiated_codecs = 0;
for(j = 0; j < m_idx; j++) { for(j = 0; j < m_idx; j++) {
payload_map_t *pmap; payload_map_t *pmap = switch_core_media_add_payload_map(session,
if (matches[j].imp->codec_type != SWITCH_CODEC_TYPE_AUDIO) {
continue;
}
pmap = switch_core_media_add_payload_map(session,
SWITCH_MEDIA_TYPE_AUDIO, SWITCH_MEDIA_TYPE_AUDIO,
matches[j].map->rm_encoding, matches[j].map->rm_encoding,
matches[j].map->rm_fmtp, matches[j].map->rm_fmtp,