[svn-commits] kmoore: branch group/media_formats-reviewed-trunk r418653 - /team/group/media...

[SVN commits to the Digium repositories]

Author: kmoore
Date: Tue Jul 15 12:49:07 2014
New Revision: 418653

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418653
Log:
media formats: Fix direct media blind transfer tests

This adds back in a call to ast_format_cap_identical when checking if
the formats for an RTP peer had changed in set_rtp_peer callback for
chan_pjsip. This corrects repeating reinvite behavior in direct media
tests.

Review: https://reviewboard.asterisk.org/r/3790/

Modified:
    team/group/media_formats-reviewed-trunk/channels/chan_pjsip.c

Modified: team/group/media_formats-reviewed-trunk/channels/chan_pjsip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats-reviewed-trunk/channels/chan_pjsip.c?view=diff&rev=418653&r1=418652&r2=418653
==============================================================================
--- team/group/media_formats-reviewed-trunk/channels/chan_pjsip.c (original)
+++ team/group/media_formats-reviewed-trunk/channels/chan_pjsip.c Tue Jul 15 12:49:07 2014
@@ -326,7 +326,7 @@
 		return 0;
 	}
 
-	if (cap && ast_format_cap_count(cap)) {
+	if (cap && ast_format_cap_count(cap) && !ast_format_cap_identical(session->direct_media_cap, cap)) {
 		ast_format_cap_remove_by_type(session->direct_media_cap, AST_MEDIA_TYPE_UNKNOWN);
 		ast_format_cap_append_from_cap(session->direct_media_cap, cap, AST_MEDIA_TYPE_UNKNOWN);
 		changed = 1;