[asterisk-commits] oej: trunk r49968 - in /trunk: include/asterisk/frame.h main/frame.c main/rtp.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Mon Jan  8 05:49:23 2007
New Revision: 49968

URL: http://svn.digium.com/view/asterisk?view=rev&rev=49968
Log:
Issue #8663 - Add passthrough support for MPEG4 (neutrino88). 

Modified:
    trunk/include/asterisk/frame.h
    trunk/main/frame.c
    trunk/main/rtp.c

Modified: trunk/include/asterisk/frame.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/frame.h?view=diff&rev=49968&r1=49967&r2=49968
==============================================================================
--- trunk/include/asterisk/frame.h (original)
+++ trunk/include/asterisk/frame.h Mon Jan  8 05:49:23 2007
@@ -258,6 +258,8 @@
 #define AST_FORMAT_H263_PLUS	(1 << 20)
 /*! H.264 Video */
 #define AST_FORMAT_H264		(1 << 21)
+/*! MPEG4 Video */
+#define AST_FORMAT_MP4_VIDEO	(1 << 22)
 /*! Maximum video format */
 #define AST_FORMAT_MAX_VIDEO	(1 << 24)
 #define AST_FORMAT_VIDEO_MASK   (((1 << 25)-1) & ~(AST_FORMAT_AUDIO_MASK))

Modified: trunk/main/frame.c
URL: http://svn.digium.com/view/asterisk/trunk/main/frame.c?view=diff&rev=49968&r1=49967&r2=49968
==============================================================================
--- trunk/main/frame.c (original)
+++ trunk/main/frame.c Mon Jan  8 05:49:23 2007
@@ -124,10 +124,11 @@
 	{ 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" },

Modified: trunk/main/rtp.c
URL: http://svn.digium.com/view/asterisk/trunk/main/rtp.c?view=diff&rev=49968&r1=49967&r2=49968
==============================================================================
--- trunk/main/rtp.c (original)
+++ trunk/main/rtp.c Mon Jan  8 05:49:23 2007
@@ -1375,6 +1375,7 @@
 	{{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 @@
 	[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},