[svn-commits] mjordan: branch 12 r425943 - /branches/12/res/res_pjsip_sdp_rtp.c

[SVN commits to the Digium repositories]

Author: mjordan
Date: Sat Oct 18 22:58:16 2014
New Revision: 425943

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=425943
Log:
res/res_pjsip_sdp_rtp: Undo 425921

This patch for r425921 introduced a different bug, wherein sending an INVITE
request with no SDP would cause Asterisk to not send an SDP Offer in the 200
OK. The current structure of res_pjsip_sdp_rtp is a bit hard to deal with
to fix this, particularly in 12:
(1) The format capabilities structures and how they are used are a bit harder
    to manipulate than they are in 13
(2) create_outgoing_sdp has no knowledge of whether or not it is creating an
    SDP as a new Offer or an Answer. This is something of an oversight in the
    callback definition, as the caller of it does have this information.

Modified:
    branches/12/res/res_pjsip_sdp_rtp.c

Modified: branches/12/res/res_pjsip_sdp_rtp.c
URL: http://svnview.digium.com/svn/asterisk/branches/12/res/res_pjsip_sdp_rtp.c?view=diff&rev=425943&r1=425942&r2=425943
==============================================================================
--- branches/12/res/res_pjsip_sdp_rtp.c (original)
+++ branches/12/res/res_pjsip_sdp_rtp.c Sat Oct 18 22:58:16 2014
@@ -912,14 +912,15 @@
 	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;