[Asterisk-cvs] asterisk frame.c,1.46,1.47 rtp.c,1.112,1.113

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv28172

Modified Files:
	frame.c rtp.c 
Log Message:
Merge H.263+ support (bug #3709)


Index: frame.c
===================================================================
RCS file: /usr/cvsroot/asterisk/frame.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- frame.c	28 Feb 2005 06:06:42 -0000	1.46
+++ frame.c	5 Mar 2005 20:57:49 -0000	1.47
@@ -420,6 +420,7 @@
 	{ 1, AST_FORMAT_PNG, "png", "PNG image"},
 	{ 1, AST_FORMAT_H261, "h261", "H.261 Video" },
 	{ 1, AST_FORMAT_H263, "h263", "H.263 Video" },
+	{ 1, AST_FORMAT_H263_PLUS, "h263p", "H.263+ Video" },
 	{ 0, 0, "nothing", "undefined" },
 	{ 0, 0, "nothing", "undefined" },
 	{ 0, 0, "nothing", "undefined" },
@@ -559,7 +560,7 @@
 
 	if ((argc == 2) || (!strcasecmp(argv[1],"video"))) {
 		found = 1;
-		for (i=18;i<20;i++) {
+		for (i=18;i<21;i++) {
 			snprintf(hex,25,"(0x%x)",1<<i);
 			ast_cli(fd, "%11u (1 << %2d) %10s  video   %5s   (%s)\n",1 << i,i,hex,ast_getformatname(1<<i),ast_codec2str(1<<i));
 		}

Index: rtp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/rtp.c,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- rtp.c	4 Mar 2005 06:47:23 -0000	1.112
+++ rtp.c	5 Mar 2005 20:57:49 -0000	1.113
@@ -666,6 +666,7 @@
   {{1, AST_FORMAT_PNG}, "video", "PNG"},
   {{1, AST_FORMAT_H261}, "video", "H261"},
   {{1, AST_FORMAT_H263}, "video", "H263"},
+  {{1, AST_FORMAT_H263_PLUS}, "video", "h263-1998"},
 };
 
 /* Static (i.e., well-known) RTP payload types for our "AST_FORMAT..."s:
@@ -690,6 +691,7 @@
   [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},
   [101] = {0, AST_RTP_DTMF},
   [110] = {1, AST_FORMAT_SPEEX},
@@ -1400,6 +1402,7 @@
 		/* fall through to... */
 	case AST_FORMAT_H261:
 	case AST_FORMAT_H263:
+	case AST_FORMAT_H263_PLUS:
 	case AST_FORMAT_G723_1:
 	case AST_FORMAT_LPC10:
 	case AST_FORMAT_SPEEX: