Well, yes...

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@48259 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Olle Johansson 19 years ago
parent b8fcae6d75
commit 00bf07b12e

@ -263,8 +263,9 @@ extern struct ast_frame ast_null_frame;
#define AST_FORMAT_VIDEO_MASK (((1 << 25)-1) & ~(AST_FORMAT_AUDIO_MASK)) #define AST_FORMAT_VIDEO_MASK (((1 << 25)-1) & ~(AST_FORMAT_AUDIO_MASK))
/*! T.140 Text format - ITU T.140, RFC 4351*/ /*! T.140 Text format - ITU T.140, RFC 4351*/
#define AST_FORMAT_T140 (1 << 25) #define AST_FORMAT_T140 (1 << 25)
/*! Maximum text mask */
#define AST_FORMAT_MAX_TEXT (1 << 26) #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 { enum ast_control_frame_type {
AST_CONTROL_HANGUP = 1, /*!< Other end has hungup */ AST_CONTROL_HANGUP = 1, /*!< Other end has hungup */

@ -130,7 +130,7 @@ static struct ast_format_list AST_FORMAT_LIST[] = { /*!< Bit number: comment
{ 0, 0, "nothing", "undefined" }, { 0, 0, "nothing", "undefined" },
{ 0, 0, "nothing", "undefined" }, { 0, 0, "nothing", "undefined" },
{ 0, AST_FORMAT_MAX_VIDEO, "maxvideo", "Maximum video format" }, { 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, 0, "nothing", "undefined" }, { 0, 0, "nothing", "undefined" },
{ 0, AST_FORMAT_MAX_TEXT, "maxtext", "Maximum text format" }, { 0, AST_FORMAT_MAX_TEXT, "maxtext", "Maximum text format" },

@ -1440,7 +1440,7 @@ static struct rtpPayloadType static_RTP_PT[MAX_RTP_PT] = {
[97] = {1, AST_FORMAT_ILBC}, [97] = {1, AST_FORMAT_ILBC},
[99] = {1, AST_FORMAT_H264}, [99] = {1, AST_FORMAT_H264},
[101] = {0, AST_RTP_DTMF}, [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}, [110] = {1, AST_FORMAT_SPEEX},
[111] = {1, AST_FORMAT_G726}, [111] = {1, AST_FORMAT_G726},
[112] = {1, AST_FORMAT_G726_AAL2}, [112] = {1, AST_FORMAT_G726_AAL2},

Loading…
Cancel
Save