Asterisk
/
asterisk
mirror of https://github.com/asterisk/asterisk
1
0
Fork 0
Code Issues Releases Wiki Activity

Issue #8663 - Add passthrough support for MPEG4 (neutrino88).

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@49968 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.6.0
Olle Johansson 19 years ago
parent 975dba04bc
commit 68ff3c3575
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File

2
include/asterisk/frame.h
Unescape View File

@ -258,6 +258,8 @@ extern struct ast_frame ast_null_frame;
#define AST_FORMAT_H263_PLUS (1 << 20) #define AST_FORMAT_H263_PLUS (1 << 20)
/*! H.264 Video */ /*! H.264 Video */
#define AST_FORMAT_H264 (1 << 21) #define AST_FORMAT_H264 (1 << 21)
/*! MPEG4 Video */
#define AST_FORMAT_MP4_VIDEO (1 << 22)
/*! Maximum video format */ /*! Maximum video format */
#define AST_FORMAT_MAX_VIDEO (1 << 24) #define AST_FORMAT_MAX_VIDEO (1 << 24)
#define AST_FORMAT_VIDEO_MASK (((1 << 25)-1) & ~(AST_FORMAT_AUDIO_MASK)) #define AST_FORMAT_VIDEO_MASK (((1 << 25)-1) & ~(AST_FORMAT_AUDIO_MASK))

7
main/frame.c
Unescape View File

@ -124,10 +124,11 @@ static struct ast_format_list AST_FORMAT_LIST[] = { /*!< Bit number: comment
{ 0, AST_FORMAT_MAX_AUDIO, "maxaudio", "Maximum audio format" }, { 0, AST_FORMAT_MAX_AUDIO, "maxaudio", "Maximum audio format" },
{ 1, AST_FORMAT_JPEG, "jpeg", "JPEG image"}, /*!< 17: See format_jpeg.c */ { 1, AST_FORMAT_JPEG, "jpeg", "JPEG image"}, /*!< 17: See format_jpeg.c */
{ 1, AST_FORMAT_PNG, "png", "PNG image"}, /*!< 18: Image format */ { 1, AST_FORMAT_PNG, "png", "PNG image"}, /*!< 18: Image format */
{ 1, AST_FORMAT_H261, "h261", "H.261 Video" }, /*!< 19: Video Passthrough */ { 1, AST_FORMAT_H261, "h261", "H.261 Video" }, /*!< 19: H.261 Video Passthrough */
{ 1, AST_FORMAT_H263, "h263", "H.263 Video" }, /*!< 20: Passthrough support, see format_h263.c */ { 1, AST_FORMAT_H263, "h263", "H.263 Video" }, /*!< 20: H.263 Passthrough support, see format_h263.c */
{ 1, AST_FORMAT_H263_PLUS, "h263p", "H.263+ Video" }, /*!< 21: See format_h263.c */ { 1, AST_FORMAT_H263_PLUS, "h263p", "H.263+ Video" }, /*!< 21: H.263plus passthrough support See format_h263.c */
{ 1, AST_FORMAT_H264, "h264", "H.264 Video" }, /*!< 22: Passthrough support, see format_h263.c */ { 1, AST_FORMAT_H264, "h264", "H.264 Video" }, /*!< 22: Passthrough support, see format_h263.c */
{ 1, AST_FORMAT_MP4_VIDEO, "mpeg4", "MPEG4 Video" }, /*!< Passthrough support for MPEG4 */
{ 0, 0, "nothing", "undefined" }, { 0, 0, "nothing", "undefined" },
{ 0, 0, "nothing", "undefined" }, { 0, 0, "nothing", "undefined" },
{ 0, 0, "nothing", "undefined" }, { 0, 0, "nothing", "undefined" },

4
main/rtp.c
Unescape View File

@ -1375,6 +1375,7 @@ static struct {
{{1, AST_FORMAT_H263}, "video", "H263"}, {{1, AST_FORMAT_H263}, "video", "H263"},
{{1, AST_FORMAT_H263_PLUS}, "video", "h263-1998"}, {{1, AST_FORMAT_H263_PLUS}, "video", "h263-1998"},
{{1, AST_FORMAT_H264}, "video", "H264"}, {{1, AST_FORMAT_H264}, "video", "H264"},
{{1, AST_FORMAT_MP4_VIDEO}, "video", "MP4V-ES"},
{{1, AST_FORMAT_T140}, "text", "T140"}, {{1, AST_FORMAT_T140}, "text", "T140"},
}; };
@ -1403,11 +1404,12 @@ static struct rtpPayloadType static_RTP_PT[MAX_RTP_PT] = {
[26] = {1, AST_FORMAT_JPEG}, [26] = {1, AST_FORMAT_JPEG},
[31] = {1, AST_FORMAT_H261}, [31] = {1, AST_FORMAT_H261},
[34] = {1, AST_FORMAT_H263}, [34] = {1, AST_FORMAT_H263},
[103] = {1, AST_FORMAT_H263_PLUS},
[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] = {1, AST_FORMAT_T140}, /* Real time text chat */ [102] = {1, AST_FORMAT_T140}, /* Real time text chat */
[103] = {1, AST_FORMAT_H263_PLUS},
[104] = {1, AST_FORMAT_MP4_VIDEO},
[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},

Write Preview
Loading…
Cancel
Save