[asterisk-commits] oej: trunk r48259 - in /trunk: include/asterisk/frame.h main/frame.c main/rtp.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue Dec  5 05:09:23 2006
New Revision: 48259

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48259
Log:
Well, yes... 

Modified:
    trunk/include/asterisk/frame.h
    trunk/main/frame.c
    trunk/main/rtp.c

Modified: trunk/include/asterisk/frame.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/frame.h?view=diff&rev=48259&r1=48258&r2=48259
==============================================================================
--- trunk/include/asterisk/frame.h (original)
+++ trunk/include/asterisk/frame.h Tue Dec  5 05:09:23 2006
@@ -263,8 +263,9 @@
 #define AST_FORMAT_VIDEO_MASK   (((1 << 25)-1) & ~(AST_FORMAT_AUDIO_MASK))
 /*! T.140 Text format - ITU T.140, RFC 4351*/
 #define AST_FORMAT_T140		(1 << 25)
+/*! Maximum text mask */
 #define AST_FORMAT_MAX_TEXT	(1 << 26)
-#define AST_FORMAT_TEXT_MASK   (((1 << 25)-1) & ~(AST_FORMAT_AUDIO_MASK))
+#define AST_FORMAT_TEXT_MASK   (((1 << 27)-1) & ~(AST_FORMAT_AUDIO_MASK) & ~(AST_FORMAT_VIDEO_MASK)))
 
 enum ast_control_frame_type {
 	AST_CONTROL_HANGUP = 1,		/*!< Other end has hungup */

Modified: trunk/main/frame.c
URL: http://svn.digium.com/view/asterisk/trunk/main/frame.c?view=diff&rev=48259&r1=48258&r2=48259
==============================================================================
--- trunk/main/frame.c (original)
+++ trunk/main/frame.c Tue Dec  5 05:09:23 2006
@@ -130,7 +130,7 @@
 	{ 0, 0, "nothing", "undefined" },
 	{ 0, 0, "nothing", "undefined" },
 	{ 0, AST_FORMAT_MAX_VIDEO, "maxvideo", "Maximum video format" },
-	{ 0, AST_FORMAT_T140, "t140", "Passthrough T.140 Realtime Text" },
+	{ 1, AST_FORMAT_T140, "t140", "Passthrough T.140 Realtime Text" },
 	{ 0, 0, "nothing", "undefined" },
 	{ 0, 0, "nothing", "undefined" },
 	{ 0, AST_FORMAT_MAX_TEXT, "maxtext", "Maximum text format" },

Modified: trunk/main/rtp.c
URL: http://svn.digium.com/view/asterisk/trunk/main/rtp.c?view=diff&rev=48259&r1=48258&r2=48259
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Tue Dec  5 05:09:23 2006
@@ -1440,7 +1440,7 @@
 	[97] = {1, AST_FORMAT_ILBC},
 	[99] = {1, AST_FORMAT_H264},
 	[101] = {0, AST_RTP_DTMF},
-	[102] = {0, AST_FORMAT_T140},	/* Real time text chat */
+	[102] = {1, AST_FORMAT_T140},	/* Real time text chat */
 	[110] = {1, AST_FORMAT_SPEEX},
 	[111] = {1, AST_FORMAT_G726},
 	[112] = {1, AST_FORMAT_G726_AAL2},