diff options
| author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-05 11:09:23 +0000 |
|---|---|---|
| committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-12-05 11:09:23 +0000 |
| commit | b4c95c187617c2fbb4f51ace7a894c262c471958 (patch) | |
| tree | 64c4dce4b27cd61a04a16cab130797c9c8bd5f7d | |
| parent | 1158861b78d4071b5bb6c3992b6eeef081bfe125 (diff) | |
Well, yes...
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@48259 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | include/asterisk/frame.h | 3 | ||||
| -rw-r--r-- | main/frame.c | 2 | ||||
| -rw-r--r-- | main/rtp.c | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/include/asterisk/frame.h b/include/asterisk/frame.h index 475317a23..49968ff36 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 bac9340c7..6e539e7c9 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 307ae1888..c629da006 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}, |