From: Olle Johansson <oej@edvina.net>
Date: Tue, 5 Dec 2006 11:09:23 +0000 (+0000)
Subject: Well, yes...
X-Git-Tag: 1.6.0-beta1~3^2~3791
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00bf07b12e8d1b32ead222af0a446cd12993c1ea;p=thirdparty%2Fasterisk.git

Well, yes...


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48259 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h
index 475317a23a..49968ff36a 100644
--- a/include/asterisk/frame.h
+++ b/include/asterisk/frame.h
@@ -263,8 +263,9 @@ extern struct ast_frame ast_null_frame;
 #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 */
diff --git a/main/frame.c b/main/frame.c
index bac9340c7f..6e539e7c9c 100644
--- a/main/frame.c
+++ b/main/frame.c
@@ -130,7 +130,7 @@ static struct ast_format_list AST_FORMAT_LIST[] = {					/*!< Bit number: comment
 	{ 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" },
diff --git a/main/rtp.c b/main/rtp.c
index 307ae18889..c629da006b 100644
--- a/main/rtp.c
+++ b/main/rtp.c
@@ -1440,7 +1440,7 @@ static struct rtpPayloadType static_RTP_PT[MAX_RTP_PT] = {
 	[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},