kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-03-15 13:14:03 +00:00
Code Issues Projects Releases Wiki Activity

set fmtp in payload_map init function

Browse Source
This commit is contained in:
Anthony Minessale 2013-11-19 00:43:30 +05:00
parent 46f5055914
commit f14260e8dd
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/include/switch_core_media.h
View File

@ -315,6 +315,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_get_payload_code(switch_core
SWITCH_DECLARE(payload_map_t *) switch_core_media_add_payload_map(switch_core_session_t *session, SWITCH_DECLARE(payload_map_t *) switch_core_media_add_payload_map(switch_core_session_t *session,
switch_media_type_t type, switch_media_type_t type,
const char *name, const char *name,
const char *fmtp,
switch_sdp_type_t sdp_type, switch_sdp_type_t sdp_type,
uint32_t pt, uint32_t pt,
uint32_t rate, uint32_t rate,

9
src/switch_core_media.c
View File

@ -511,6 +511,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_get_payload_code(switch_core
SWITCH_DECLARE(payload_map_t *) switch_core_media_add_payload_map(switch_core_session_t *session, SWITCH_DECLARE(payload_map_t *) switch_core_media_add_payload_map(switch_core_session_t *session,
switch_media_type_t type, switch_media_type_t type,
const char *name, const char *name,
const char *fmtp,
switch_sdp_type_t sdp_type, switch_sdp_type_t sdp_type,
uint32_t pt, uint32_t pt,
uint32_t rate, uint32_t rate,
@ -567,6 +568,10 @@ SWITCH_DECLARE(payload_map_t *) switch_core_media_add_payload_map(switch_core_se
pmap->rate = rate; pmap->rate = rate;
} }
if (!zstr(fmtp) && (!pmap->rm_fmtp || strcmp(pmap->rm_fmtp, fmtp))) {
pmap->rm_fmtp = switch_core_strdup(session->pool, fmtp);
}
pmap->allocated = 1; pmap->allocated = 1;
pmap->recv_pt = (switch_payload_t)pt; pmap->recv_pt = (switch_payload_t)pt;
@ -3286,6 +3291,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
payload_map_t *pmap = switch_core_media_add_payload_map(session, payload_map_t *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,
sdp_type, sdp_type,
matches[j].map->rm_pt, matches[j].map->rm_pt,
matches[j].imp->samples_per_second, matches[j].imp->samples_per_second,
@ -3534,6 +3540,7 @@ SWITCH_DECLARE(uint8_t) switch_core_media_negotiate_sdp(switch_core_session_t *s
payload_map_t *pmap = switch_core_media_add_payload_map(session, payload_map_t *pmap = switch_core_media_add_payload_map(session,
SWITCH_MEDIA_TYPE_VIDEO, SWITCH_MEDIA_TYPE_VIDEO,
matches[j].map->rm_encoding, matches[j].map->rm_encoding,
matches[j].map->rm_fmtp,
sdp_type, sdp_type,
matches[j].map->rm_pt, matches[j].map->rm_pt,
matches[j].imp->samples_per_second, matches[j].imp->samples_per_second,
@ -5806,6 +5813,7 @@ SWITCH_DECLARE(void) switch_core_media_gen_local_sdp(switch_core_session_t *sess
switch_core_media_add_payload_map(session, switch_core_media_add_payload_map(session,
imp->codec_type == SWITCH_CODEC_TYPE_AUDIO ? SWITCH_MEDIA_TYPE_AUDIO : SWITCH_MEDIA_TYPE_VIDEO, imp->codec_type == SWITCH_CODEC_TYPE_AUDIO ? SWITCH_MEDIA_TYPE_AUDIO : SWITCH_MEDIA_TYPE_VIDEO,
imp->iananame, imp->iananame,
NULL,
sdp_type, sdp_type,
smh->ianacodes[i], smh->ianacodes[i],
imp->samples_per_second, imp->samples_per_second,
@ -7868,6 +7876,7 @@ static void switch_core_media_set_r_sdp_codec_string(switch_core_session_t *sess
switch_core_media_add_payload_map(session, switch_core_media_add_payload_map(session,
m->m_type == sdp_media_audio ? SWITCH_MEDIA_TYPE_AUDIO : SWITCH_MEDIA_TYPE_VIDEO, m->m_type == sdp_media_audio ? SWITCH_MEDIA_TYPE_AUDIO : SWITCH_MEDIA_TYPE_VIDEO,
map->rm_encoding, map->rm_encoding,
map->rm_fmtp,
sdp_type, sdp_type,
map->rm_pt, map->rm_pt,
map->rm_rate, map->rm_rate,