[svn-commits] dvossel: trunk r236144 - /trunk/channels/chan_iax2.c

[SVN commits to the Digium repositories]

Author: dvossel
Date: Tue Dec 22 15:53:46 2009
New Revision: 236144

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=236144
Log:
fixes iax "can't compress subclass 4294967295" error

(closes issue #16456)
Reported by: dvossel
Tested by: dvossel


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=236144&r1=236143&r2=236144
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Tue Dec 22 15:53:46 2009
@@ -6248,10 +6248,15 @@
 		if (!transfer)
 			pvt->aseqno = fr->iseqno;
 		fh->type = fr->af.frametype & 0xFF;
-		if (fr->af.frametype == AST_FRAME_VIDEO)
+
+		if (fr->af.frametype == AST_FRAME_VIDEO) {
 			fh->csub = compress_subclass(fr->af.subclass.codec & ~0x1LL) | ((fr->af.subclass.codec & 0x1LL) << 6);
-		else
+		} else if (fr->af.frametype == AST_FRAME_VOICE) {
 			fh->csub = compress_subclass(fr->af.subclass.codec);
+		} else {
+			fh->csub = compress_subclass(fr->af.subclass.integer);
+		}
+
 		if (transfer) {
 			fr->dcallno = pvt->transfercallno;
 		} else