diff options
| author | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-08 11:49:23 +0000 |
|---|---|---|
| committer | oej <oej@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-01-08 11:49:23 +0000 |
| commit | 38af1ed26e91ed0840b9ade8a434a13931dc1561 (patch) | |
| tree | d6b91bbbd4d1ab7934aeff2e4b76e12f3b743271 /main | |
| parent | f59af2bd999c1feaa4088c2d12f05e04b53949e8 (diff) | |
Issue #8663 - Add passthrough support for MPEG4 (neutrino88).
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@49968 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/frame.c | 7 | ||||
| -rw-r--r-- | main/rtp.c | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/main/frame.c b/main/frame.c index 39ba8cdad..6471f1913 100644 --- a/main/frame.c +++ b/main/frame.c @@ -124,10 +124,11 @@ static struct ast_format_list AST_FORMAT_LIST[] = { /*!< Bit number: comment { 0, AST_FORMAT_MAX_AUDIO, "maxaudio", "Maximum audio format" }, { 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_H261, "h261", "H.261 Video" }, /*!< 19: Video Passthrough */ - { 1, AST_FORMAT_H263, "h263", "H.263 Video" }, /*!< 20: Passthrough support, see format_h263.c */ - { 1, AST_FORMAT_H263_PLUS, "h263p", "H.263+ Video" }, /*!< 21: See format_h263.c */ + { 1, AST_FORMAT_H261, "h261", "H.261 Video" }, /*!< 19: H.261 Video Passthrough */ + { 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: 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_MP4_VIDEO, "mpeg4", "MPEG4 Video" }, /*!< Passthrough support for MPEG4 */ { 0, 0, "nothing", "undefined" }, { 0, 0, "nothing", "undefined" }, { 0, 0, "nothing", "undefined" }, diff --git a/main/rtp.c b/main/rtp.c index 43a49830f..9794c3f22 100644 --- a/main/rtp.c +++ b/main/rtp.c @@ -1375,6 +1375,7 @@ static struct { {{1, AST_FORMAT_H263}, "video", "H263"}, {{1, AST_FORMAT_H263_PLUS}, "video", "h263-1998"}, {{1, AST_FORMAT_H264}, "video", "H264"}, + {{1, AST_FORMAT_MP4_VIDEO}, "video", "MP4V-ES"}, {{1, AST_FORMAT_T140}, "text", "T140"}, }; @@ -1403,11 +1404,12 @@ static struct rtpPayloadType static_RTP_PT[MAX_RTP_PT] = { [26] = {1, AST_FORMAT_JPEG}, [31] = {1, AST_FORMAT_H261}, [34] = {1, AST_FORMAT_H263}, - [103] = {1, AST_FORMAT_H263_PLUS}, [97] = {1, AST_FORMAT_ILBC}, [99] = {1, AST_FORMAT_H264}, [101] = {0, AST_RTP_DTMF}, [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}, [111] = {1, AST_FORMAT_G726}, [112] = {1, AST_FORMAT_G726_AAL2}, |