From d3e951edf5517b9f508a7e1b474176ec2be9e18f Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Tue, 6 Jun 2017 12:04:21 +0000 Subject: pjsip: Extend 'asymmetric_rtp_codec' option to include us changing. PJSIP support in Asterisk differs from chan_sip in that it allows media to be sent as-is without transcoding provided the codecs were negotiated in the SDP. This is allowed according to the RFC. Support for this differs quite a lot though and some endpoints do not handle it well. This change extends the 'asymmetric_rtp_codec' option to also cover this case. When set to no (the default) the code behaves as chan_sip does - the best codec is selected and we will only ever send that, unless we change what we are sending if the remote side changes. When set to yes we will send media as-is without transcoding if the codec has been negotiated in the SDP. ASTERISK-26996 Change-Id: Ib1647f6902a0843e8c435946f831c2159e8d1d51 --- res/res_pjsip_sdp_rtp.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'res/res_pjsip_sdp_rtp.c') diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c index 97e365c10..c5a673aa4 100644 --- a/res/res_pjsip_sdp_rtp.c +++ b/res/res_pjsip_sdp_rtp.c @@ -410,13 +410,29 @@ static int set_caps(struct ast_sip_session *session, ast_format_cap_append_from_cap(caps, ast_channel_nativeformats(session->channel), AST_MEDIA_TYPE_UNKNOWN); ast_format_cap_remove_by_type(caps, media_type); + if (session->endpoint->preferred_codec_only){ struct ast_format *preferred_fmt = ast_format_cap_get_format(joint, 0); ast_format_cap_append(caps, preferred_fmt, 0); ao2_ref(preferred_fmt, -1); + } else if (!session->endpoint->asymmetric_rtp_codec) { + struct ast_format *best; + /* + * If we don't allow the sending codec to be changed on our side + * then get the best codec from the joint capabilities of the media + * type and use only that. This ensures the core won't start sending + * out a format that we aren't currently sending. + */ + + best = ast_format_cap_get_best_by_type(joint, media_type); + if (best) { + ast_format_cap_append(caps, best, ast_format_cap_get_framing(joint)); + ao2_ref(best, -1); + } } else { ast_format_cap_append_from_cap(caps, joint, media_type); } + /* * Apply the new formats to the channel, potentially changing * raw read/write formats and translation path while doing so. -- cgit v1.2.3