[asterisk-commits] file: trunk r419093 - /trunk/channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: file
Date: Mon Jul 21 11:09:33 2014
New Revision: 419093

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=419093
Log:
chan_iax2: Only send mini frames if the underlying format has not changed, not if it has.

ASTERISK-24072 #close
Reported by: Matt Jordan

Modified:
    trunk/channels/chan_iax2.c

Modified: trunk/channels/chan_iax2.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=419093&r1=419092&r2=419093
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Mon Jul 21 11:09:33 2014
@@ -6533,7 +6533,8 @@
 		/* High two bytes are the same on timestamp, or sending on a trunk */ &&
 	    (f->frametype == AST_FRAME_VOICE)
 		/* is a voice frame */ &&
-		(ast_format_cmp(f->subclass.format, ast_format_compatibility_bitfield2format(pvt->svoiceformat)))
+		(ast_format_cmp(f->subclass.format, ast_format_compatibility_bitfield2format(pvt->svoiceformat)) ==
+			AST_FORMAT_CMP_EQUAL)
 		/* is the same type */ ) {
 			/* Force immediate rather than delayed transmission */
 			now = 1;
@@ -6547,7 +6548,8 @@
 		 * Otherwise send a mini video frame
 		 */
 		if (((fts & 0xFFFF8000L) == (pvt->lastvsent & 0xFFFF8000L)) &&
-		(ast_format_cmp(f->subclass.format, ast_format_compatibility_bitfield2format(pvt->svideoformat)))
+		(ast_format_cmp(f->subclass.format, ast_format_compatibility_bitfield2format(pvt->svideoformat)) ==
+			AST_FORMAT_CMP_EQUAL)
 		   ) {
 			now = 1;
 			sendmini = 1;