From: Matthew Jordan Date: Sun, 19 Oct 2014 00:49:10 +0000 (+0000) Subject: res/res_pjsip_sdp_rtp: Check joint caps when looking to decline outgoing media X-Git-Tag: 12.7.0-rc1~36 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a58f9137176b39e76d1745fe05a670538d4fef42;p=thirdparty%2Fasterisk.git res/res_pjsip_sdp_rtp: Check joint caps when looking to decline outgoing media When constructing an outgoing media stream for an SDP offer/answer, the current code checks the override preferences (set by the PJSIP_MEDIA_OFFER function) as well as what is configured on the endpoint to determine if a codec is available for the media stream. Unfortunately, this isn't good enough: we must also look at the negotiated (joint) format capabilities. Otherwise, we'll construct a media stream offer/answer with no codecs. Note that this isn't an issue in 13, which already looks at the joint capabilities thanks to the media re-work done there. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@425921 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/res/res_pjsip_sdp_rtp.c b/res/res_pjsip_sdp_rtp.c index 191ff73e01..6d97c9a891 100644 --- a/res/res_pjsip_sdp_rtp.c +++ b/res/res_pjsip_sdp_rtp.c @@ -912,15 +912,14 @@ static int create_outgoing_sdp_stream(struct ast_sip_session *session, struct as struct ast_format format; RAII_VAR(struct ast_format_cap *, caps, NULL, ast_format_cap_destroy); enum ast_format_type media_type = stream_to_media_type(session_media->stream_type); - int direct_media_enabled = !ast_sockaddr_isnull(&session_media->direct_media_addr) && !ast_format_cap_is_empty(session->direct_media_cap); - int use_override_prefs = session->override_prefs.formats[0].id; struct ast_codec_pref *prefs = use_override_prefs ? &session->override_prefs : &session->endpoint->media.prefs; if ((use_override_prefs && !codec_pref_has_type(&session->override_prefs, media_type)) || + (!use_override_prefs && !ast_format_cap_has_type(session->req_caps, media_type)) || (!use_override_prefs && !ast_format_cap_has_type(session->endpoint->media.codecs, media_type))) { /* If no type formats are configured don't add a stream */ return 0;