[Asterisk-cvs] asterisk/channels chan_h323.c, 1.105, 1.106 chan_iax2.c, 1.255, 1.256 chan_mgcp.c, 1.108, 1.109 chan_sip.c, 1.674, 1.675 chan_skinny.c, 1.68, 1.69 iax2.h, 1.21, 1.22

[markster at lists.digium.com]

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

Modified Files:
	chan_h323.c chan_iax2.c chan_mgcp.c chan_sip.c chan_skinny.c 
	iax2.h 
Log Message:
Add PLC and jitter buffer and iax2 meta trunk with timestamps (bug #2532, #3400)


Index: chan_h323.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_h323.c,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- chan_h323.c	8 Mar 2005 23:11:23 -0000	1.105
+++ chan_h323.c	17 Mar 2005 21:30:19 -0000	1.106
@@ -197,6 +197,7 @@
 	.type = type,
 	.description = tdesc,
 	.capabilities = AST_FORMAT_ULAW,
+	.properties = AST_CHAN_TP_WANTSJITTER,
 	.requester = oh323_request,
 	.send_digit = oh323_digit,
 	.call = oh323_call,

Index: chan_iax2.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_iax2.c,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -d -r1.255 -r1.256
--- chan_iax2.c	16 Mar 2005 18:33:56 -0000	1.255
+++ chan_iax2.c	17 Mar 2005 21:30:19 -0000	1.256
@@ -70,6 +70,14 @@
 #include "iax2-provision.h"
 #include "../astconf.h"
 
+/* Define NEWJB to use the new channel independent jitterbuffer,
+ * otherwise, use the old jitterbuffer */
+#define NEWJB
+
+#ifdef NEWJB
+#include "../jitterbuf.h"
+#endif
+
[...1009 lines suppressed...]
 	ast_cli_unregister(&cli_show_stats);
 	ast_cli_unregister(&cli_show_cache);
@@ -8483,6 +8929,9 @@
 
 	iax_set_output(iax_debug_output);
 	iax_set_error(iax_error_output);
+#ifdef NEWJB
+	jb_setoutput(jb_error_output, jb_warning_output, NULL);
+#endif
 	
 	/* Seed random number generator */
 	srand(time(NULL));
@@ -8530,6 +8979,7 @@
 	ast_cli_register(&cli_debug);
 	ast_cli_register(&cli_trunk_debug);
 	ast_cli_register(&cli_no_debug);
+	ast_cli_register(&cli_test_losspct);
 	ast_cli_register(&cli_set_jitter);
 	ast_cli_register(&cli_show_stats);
 	ast_cli_register(&cli_show_cache);

Index: chan_mgcp.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_mgcp.c,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- chan_mgcp.c	4 Mar 2005 06:47:24 -0000	1.108
+++ chan_mgcp.c	17 Mar 2005 21:30:19 -0000	1.109
@@ -479,6 +479,7 @@
 	.type = type,
 	.description = tdesc,
 	.capabilities = AST_FORMAT_ULAW,
+	.properties = AST_CHAN_TP_WANTSJITTER,
 	.requester = mgcp_request,
 	.call = mgcp_call,
 	.hangup = mgcp_hangup,

Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.674
retrieving revision 1.675
diff -u -d -r1.674 -r1.675
--- chan_sip.c	17 Mar 2005 16:11:19 -0000	1.674
+++ chan_sip.c	17 Mar 2005 21:30:19 -0000	1.675
@@ -631,6 +631,7 @@
 	.type = channeltype,
 	.description = "Session Initiation Protocol (SIP)",
 	.capabilities = ((AST_FORMAT_MAX_AUDIO << 1) - 1),
+	.properties = AST_CHAN_TP_WANTSJITTER,
 	.requester = sip_request,
 	.devicestate = sip_devicestate,
 	.call = sip_call,

Index: chan_skinny.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_skinny.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- chan_skinny.c	14 Mar 2005 01:05:34 -0000	1.68
+++ chan_skinny.c	17 Mar 2005 21:30:19 -0000	1.69
@@ -809,6 +809,7 @@
 	.type = type,
 	.description = tdesc,
 	.capabilities = AST_FORMAT_ULAW,
+	.properties = AST_CHAN_TP_WANTSJITTER,
 	.requester = skinny_request,
 	.call = skinny_call,
 	.hangup = skinny_hangup,

Index: iax2.h
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/iax2.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- iax2.h	12 Feb 2005 18:52:14 -0000	1.21
+++ iax2.h	17 Mar 2005 21:30:19 -0000	1.22
@@ -138,6 +138,9 @@
 #define IAX_META_TRUNK				1		/* Trunk meta-message */
 #define IAX_META_VIDEO				2		/* Video frame */
 
+#define IAX_META_TRUNK_SUPERMINI		0	/* This trunk frame contains classic supermini frames */
+#define IAX_META_TRUNK_MINI			1	/* This trunk frame contains trunked mini frames */
+
 #define IAX_RATE_8KHZ				(1 << 0) /* 8khz sampling (default if absent) */
 #define IAX_RATE_11KHZ				(1 << 1) /* 11.025khz sampling */
 #define IAX_RATE_16KHZ				(1 << 2) /* 16khz sampling */
@@ -209,6 +212,12 @@
 	unsigned short len;				/* Length of data for this callno */
 } __attribute__ ((__packed__));
 
+/* When trunktimestamps are used, we use this format instead */
+struct ast_iax2_meta_trunk_mini {
+	unsigned short len;
+	struct ast_iax2_mini_hdr mini;		/* this is an actual miniframe */
+} __attribute__ ((__packed__));
+
 #define IAX_FIRMWARE_MAGIC 0x69617879
 
 struct ast_iax2_firmware_header {