diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-04-26 10:44:00 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-04-26 10:44:00 -0500 |
| commit | e478d2eb94ec98ad8004e1b4b634b53e70591f8d (patch) | |
| tree | 41112e2b4154fc5057bbda3861fdf4890e589133 /main/rtp_engine.c | |
| parent | b382919017c2cc7f14814111f3bfc9a699cfad07 (diff) | |
| parent | 72c5f3b0ba40e352fa26eeeead6e72eabd5e7730 (diff) | |
Merge "res_pjsip_sdp_rtp: No rtpmap for static RTP payload IDs in SDP."
Diffstat (limited to 'main/rtp_engine.c')
| -rw-r--r-- | main/rtp_engine.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/main/rtp_engine.c b/main/rtp_engine.c index 0a2e84fcd..82298901d 100644 --- a/main/rtp_engine.c +++ b/main/rtp_engine.c @@ -1426,28 +1426,31 @@ static int find_unused_payload(const struct ast_rtp_codecs *codecs) * https://tools.ietf.org/html/draft-roach-mmusic-unified-plan#section-3.2.1.2 * https://tools.ietf.org/html/draft-wu-avtcore-dynamic-pt-usage#section-3 */ - res = find_unused_payload_in_range(codecs, MAX(ast_option_rtpptdynamic, 35), + res = find_unused_payload_in_range( + codecs, MAX(ast_option_rtpptdynamic, AST_RTP_PT_LAST_STATIC + 1), AST_RTP_PT_LAST_REASSIGN, static_RTP_PT); if (res != -1) { return res; } - /* Yet, reusing mappings below 35 is not supported in Asterisk because - * when Compact Headers are activated, no rtpmap is send for those below - * 35. If you want to use 35 and below + /* Yet, reusing mappings below AST_RTP_PT_LAST_STATIC (35) is not supported + * in Asterisk because when Compact Headers are activated, no rtpmap is + * send for those below 35. If you want to use 35 and below * A) do not use Compact Headers, * B) remove that code in chan_sip/res_pjsip, or * C) add a flag that this RTP Payload Type got reassigned dynamically * and requires a rtpmap even with Compact Headers enabled. */ res = find_unused_payload_in_range( - codecs, MAX(ast_option_rtpptdynamic, 20), 35, static_RTP_PT); + codecs, MAX(ast_option_rtpptdynamic, 20), + AST_RTP_PT_LAST_STATIC + 1, static_RTP_PT); if (res != -1) { return res; } return find_unused_payload_in_range( - codecs, MAX(ast_option_rtpptdynamic, 0), 20, static_RTP_PT); + codecs, MAX(ast_option_rtpptdynamic, 0), + 20, static_RTP_PT); } /*! |