[svn-commits] kmoore: trunk r415343 - in /trunk: ./ res/res_pjsip_sdp_rtp.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Fri Jun  6 14:13:08 2014
New Revision: 415343

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=415343
Log:
PJSIP: Remove premature write of raw formats

Currently, there are situations that can occur when using chan_pjsip
and certain dialplan applications (notably ChanSpy()) that can cause
the channel to get no audio with scrolling warnings about format
mismatches. This is caused by a failure to update translation paths on
a mid-call native format update since the raw formats have already
been updated by res_pjsip_sdp_rtp.c in set_caps(). Removing the
premature raw format updates allows the translation paths to be setup
correctly and the raw read and write formats with them.

AFS-63 #close
........

Merged revisions 415342 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip_sdp_rtp.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/res/res_pjsip_sdp_rtp.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_sdp_rtp.c?view=diff&rev=415343&r1=415342&r2=415343
==============================================================================
--- trunk/res/res_pjsip_sdp_rtp.c (original)
+++ trunk/res/res_pjsip_sdp_rtp.c Fri Jun  6 14:13:08 2014
@@ -251,8 +251,6 @@
 
 		/* Apply the new formats to the channel, potentially changing read/write formats while doing so */
 		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));
 		ast_set_write_format(session->channel, ast_channel_writeformat(session->channel));
 	}