[svn-commits] mmichelson: branch mmichelson/features_config r389582 - in /team/mmichelson/f...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu May 23 14:21:03 2013
New Revision: 389582

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=389582
Log:
Resolve conflict and reset automerge property.


Modified:
    team/mmichelson/features_config/   (props changed)
    team/mmichelson/features_config/res/res_sip_sdp_rtp.c

Propchange: team/mmichelson/features_config/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/mmichelson/features_config/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu May 23 14:21:03 2013
@@ -1,1 +1,1 @@
-/trunk:1-389554
+/trunk:1-389576

Modified: team/mmichelson/features_config/res/res_sip_sdp_rtp.c
URL: http://svnview.digium.com/svn/asterisk/team/mmichelson/features_config/res/res_sip_sdp_rtp.c?view=diff&rev=389582&r1=389581&r2=389582
==============================================================================
--- team/mmichelson/features_config/res/res_sip_sdp_rtp.c (original)
+++ team/mmichelson/features_config/res/res_sip_sdp_rtp.c Thu May 23 14:21:03 2013
@@ -121,6 +121,12 @@
 		ice->stop(session_media->rtp);
 	}
 
+	if (session->endpoint->dtmf == AST_SIP_DTMF_RFC_4733) {
+		ast_rtp_instance_dtmf_mode_set(session_media->rtp, AST_RTP_DTMF_MODE_RFC2833);
+	} else if (session->endpoint->dtmf == AST_SIP_DTMF_INBAND) {
+		ast_rtp_instance_dtmf_mode_set(session_media->rtp, AST_RTP_DTMF_MODE_INBAND);
+	}
+
 	return 0;
 }
 
@@ -224,11 +230,11 @@
 	if (session->channel) {
 		ast_format_cap_copy(caps, ast_channel_nativeformats(session->channel));
 		ast_format_cap_remove_bytype(caps, media_type);
-		ast_format_cap_append(caps, joint);
+		ast_codec_choose(&session->endpoint->prefs, joint, 1, &fmt);
+		ast_format_cap_add(caps, &fmt);
 
 		/* Apply the new formats to the channel, potentially changing read/write formats while doing so */
-		ast_format_cap_append(ast_channel_nativeformats(session->channel), caps);
-		ast_codec_choose(&session->endpoint->prefs, caps, 0, &fmt);
+		ast_format_cap_copy(ast_channel_nativeformats(session->channel), caps);
 		ast_format_copy(ast_channel_rawwriteformat(session->channel), &fmt);
 		ast_format_copy(ast_channel_rawreadformat(session->channel), &fmt);
 		ast_set_read_format(session->channel, ast_channel_readformat(session->channel));