[asterisk-commits] trunk - r8015 in /trunk: asterisk.c channel.c include/asterisk/frame.h

[asterisk-commits at lists.digium.com]

Author: mattf
Date: Thu Jan 12 11:14:58 2006
New Revision: 8015

URL: http://svn.digium.com/view/asterisk?rev=8015&view=rev
Log:
More changes to make t.38 support work

Modified:
    trunk/asterisk.c
    trunk/channel.c
    trunk/include/asterisk/frame.h

Modified: trunk/asterisk.c
URL: http://svn.digium.com/view/asterisk/trunk/asterisk.c?rev=8015&r1=8014&r2=8015&view=diff
==============================================================================
--- trunk/asterisk.c (original)
+++ trunk/asterisk.c Thu Jan 12 11:14:58 2006
@@ -100,6 +100,9 @@
 #include "asterisk/pbx.h"
 #include "asterisk/enum.h"
 #include "asterisk/rtp.h"
+#if defined(T38_SUPPORT)
+#include "asterisk/udptl.h"
+#endif
 #include "asterisk/app.h"
 #include "asterisk/lock.h"
 #include "asterisk/utils.h"
@@ -2319,6 +2322,9 @@
 		exit(1);
 	}
 	ast_rtp_init();
+#if defined(T38_SUPPORT)
+	ast_udptl_init();
+#endif
 	if (ast_image_init()) {
 		printf(term_quit());
 		exit(1);

Modified: trunk/channel.c
URL: http://svn.digium.com/view/asterisk/trunk/channel.c?rev=8015&r1=8014&r2=8015&view=diff
==============================================================================
--- trunk/channel.c (original)
+++ trunk/channel.c Thu Jan 12 11:14:58 2006
@@ -3274,6 +3274,9 @@
 		    (f->frametype == AST_FRAME_VIDEO) || 
 		    (f->frametype == AST_FRAME_IMAGE) ||
 		    (f->frametype == AST_FRAME_HTML) ||
+#if defined(T38_SUPPORT)
+		    (f->frametype == AST_FRAME_MODEM) ||
+#endif
 		    (f->frametype == AST_FRAME_TEXT)) {
 			if (f->frametype == AST_FRAME_DTMF) {
 				if (((who == c0) && watch_c0_dtmf) ||

Modified: trunk/include/asterisk/frame.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/frame.h?rev=8015&r1=8014&r2=8015&view=diff
==============================================================================
--- trunk/include/asterisk/frame.h (original)
+++ trunk/include/asterisk/frame.h Thu Jan 12 11:14:58 2006
@@ -145,8 +145,16 @@
 /*! Comfort Noise frame (subclass is level of CNG in -dBov), 
     body may include zero or more 8-bit quantization coefficients */
 #define AST_FRAME_CNG		10
-/*! T.38 Fax-over-IP data stream */
-#define AST_FRAME_T38		11
+#if defined(T38_SUPPORT)
+/*! Modem-over-IP data streams */
+#define AST_FRAME_MODEM		11
+
+/* MODEM subclasses */
+/*! T.38 Fax-over-IP */
+#define AST_MODEM_T38		1
+/*! V.150 Modem-over-IP */
+#define AST_MODEM_V150		2
+#endif
 
 /* HTML subclasses */
 /*! Sending a URL */