[svn-commits] branch north/chan_skinny-fixup r31465 - in /team/north/chan_skinny-fixup: ./ ...

svn-commits at lists.digium.com svn-commits at lists.digium.com
Thu Jun 1 11:20:25 MST 2006


Author: north
Date: Thu Jun  1 13:20:25 2006
New Revision: 31465

URL: http://svn.digium.com/view/asterisk?rev=31465&view=rev
Log:
Merged revisions 31409,31411-31414,31443 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r31409 | crichter | 2006-06-01 09:25:04 -0700 (Thu, 01 Jun 2006) | 1 line

unified the PH_CONTROL Interface for the mISDN_dsp interface to int
........
r31411 | crichter | 2006-06-01 09:41:07 -0700 (Thu, 01 Jun 2006) | 1 line

the interface needs to be changed as well..
........
r31412 | russell | 2006-06-01 09:42:38 -0700 (Thu, 01 Jun 2006) | 2 lines

my last changes to the jitterbuffer files need a forced make clean

........
r31413 | russell | 2006-06-01 09:47:28 -0700 (Thu, 01 Jun 2006) | 8 lines

- add the ability to configure forced jitterbuffers on h323, jingle,
  and mgcp channels
- remove the jitterbuffer configuration from the pvt structures in
  the sip, zap, and skinny channel drivers, as copying the same global
  configuration into each pvt structure has no benefit.
- update and fix some typos in jitterbuffer related documentation
(issue #7257, north, with additional updates and modifications)

........
r31414 | oej | 2006-06-01 09:58:06 -0700 (Thu, 01 Jun 2006) | 2 lines

Issue #7103 take two. Thanks Mikael!

........
r31443 | russell | 2006-06-01 10:40:50 -0700 (Thu, 01 Jun 2006) | 2 lines

allow menuselect to display dependencies and conflicts for modules

........

Modified:
    team/north/chan_skinny-fixup/   (props changed)
    team/north/chan_skinny-fixup/.cleancount
    team/north/chan_skinny-fixup/build_tools/menuselect.c
    team/north/chan_skinny-fixup/build_tools/menuselect.h
    team/north/chan_skinny-fixup/build_tools/menuselect_curses.c
    team/north/chan_skinny-fixup/channels/chan_h323.c
    team/north/chan_skinny-fixup/channels/chan_jingle.c
    team/north/chan_skinny-fixup/channels/chan_mgcp.c
    team/north/chan_skinny-fixup/channels/chan_oss.c
    team/north/chan_skinny-fixup/channels/chan_sip.c
    team/north/chan_skinny-fixup/channels/chan_skinny.c
    team/north/chan_skinny-fixup/channels/chan_zap.c
    team/north/chan_skinny-fixup/channels/h323/h323.conf.sample
    team/north/chan_skinny-fixup/channels/misdn/isdn_lib.c
    team/north/chan_skinny-fixup/channels/misdn/isdn_lib.h
    team/north/chan_skinny-fixup/configs/alsa.conf.sample
    team/north/chan_skinny-fixup/configs/mgcp.conf.sample
    team/north/chan_skinny-fixup/configs/oss.conf.sample
    team/north/chan_skinny-fixup/configs/sip.conf.sample
    team/north/chan_skinny-fixup/configs/skinny.conf.sample
    team/north/chan_skinny-fixup/configs/zapata.conf.sample

Propchange: team/north/chan_skinny-fixup/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/north/chan_skinny-fixup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun  1 13:20:25 2006
@@ -1,1 +1,1 @@
-/trunk:1-31249,31251-31392
+/trunk:1-31249,31251-31464

Modified: team/north/chan_skinny-fixup/.cleancount
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/.cleancount?rev=31465&r1=31464&r2=31465&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/.cleancount (original)
+++ team/north/chan_skinny-fixup/.cleancount Thu Jun  1 13:20:25 2006
@@ -1,1 +1,1 @@
-18
+19

Modified: team/north/chan_skinny-fixup/build_tools/menuselect.c
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/build_tools/menuselect.c?rev=31465&r1=31464&r2=31465&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/build_tools/menuselect.c (original)
+++ team/north/chan_skinny-fixup/build_tools/menuselect.c Thu Jun  1 13:20:25 2006
@@ -39,20 +39,6 @@
 #include "asterisk/linkedlists.h"
 
 #undef MENUSELECT_DEBUG
-
-struct depend {
-	/*! the name of the dependency */
-	const char *name;
-	/*! for linking */
-	AST_LIST_ENTRY(depend) list;
-};
-
-struct conflict {
-	/*! the name of the conflict */
-	const char *name;
-	/*! for linking */
-	AST_LIST_ENTRY(conflict) list;
-};
 
 /*! The list of categories */
 struct categories categories = AST_LIST_HEAD_NOLOCK_INIT_VALUE;

Modified: team/north/chan_skinny-fixup/build_tools/menuselect.h
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/build_tools/menuselect.h?rev=31465&r1=31464&r2=31465&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/build_tools/menuselect.h (original)
+++ team/north/chan_skinny-fixup/build_tools/menuselect.h Thu Jun  1 13:20:25 2006
@@ -31,8 +31,19 @@
 #define OUTPUT_MAKEOPTS_DEFAULT "menuselect.makeopts"
 #define MENUSELECT_DEPS         "build_tools/menuselect-deps"
 
-struct depend;
-struct conflict;
+struct depend {
+	/*! the name of the dependency */
+	const char *name;
+	/*! for linking */
+	AST_LIST_ENTRY(depend) list;
+};
+
+struct conflict {
+	/*! the name of the conflict */
+	const char *name;
+	/*! for linking */
+	AST_LIST_ENTRY(conflict) list;
+};
 
 struct member {
 	/*! What will be sent to the makeopts file */

Modified: team/north/chan_skinny-fixup/build_tools/menuselect_curses.c
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/build_tools/menuselect_curses.c?rev=31465&r1=31464&r2=31465&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/build_tools/menuselect_curses.c (original)
+++ team/north/chan_skinny-fixup/build_tools/menuselect_curses.c Thu Jun  1 13:20:25 2006
@@ -126,7 +126,9 @@
 {
 	int i = 0;
 	int j = 0;
-	struct member *mem;
+	struct member *mem, *curmem = NULL;
+	struct depend *dep;
+	struct conflict *con;
 	char buf[64];
 	const char *desc = NULL;
 
@@ -146,15 +148,35 @@
 		waddstr(menu, buf);
 		
 		if (curopt + 1 == i)
-			desc = mem->displayname;
+			curmem = mem;
 
 		if (i == end)
 			break;
 	}
 
-	if (desc) {
+	if (curmem->displayname) {
 		wmove(menu, end - start + 2, max_x / 2 - 16);
-		waddstr(menu, desc);
+		waddstr(menu, curmem->displayname);
+	}
+	if (!AST_LIST_EMPTY(&curmem->deps)) {
+		wmove(menu, end - start + 3, max_x / 2 - 16);
+		snprintf(buf, sizeof(buf), "Depends on: ");
+		AST_LIST_TRAVERSE(&curmem->deps, dep, list) {
+			strncat(buf, dep->name, sizeof(buf) - strlen(buf) - 1);
+			if (AST_LIST_NEXT(dep, list))
+				strncat(buf, ", ", sizeof(buf) - strlen(buf) - 1);
+		}
+		waddstr(menu, buf);
+	}
+	if (!AST_LIST_EMPTY(&curmem->conflicts)) {
+		wmove(menu, end - start + 4, max_x / 2 - 16);
+		snprintf(buf, sizeof(buf), "Conflicts with: ");
+		AST_LIST_TRAVERSE(&curmem->conflicts, con, list) {
+			strncat(buf, con->name, sizeof(buf) - strlen(buf) - 1);
+			if (AST_LIST_NEXT(con, list))
+				strncat(buf, ", ", sizeof(buf) - strlen(buf) - 1);
+		}
+		waddstr(menu, buf);
 	}
 	wmove(menu, curopt - start, max_x / 2 - 9);
 

Modified: team/north/chan_skinny-fixup/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/channels/chan_h323.c?rev=31465&r1=31464&r2=31465&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/channels/chan_h323.c (original)
+++ team/north/chan_skinny-fixup/channels/chan_h323.c Thu Jun  1 13:20:25 2006
@@ -83,6 +83,7 @@
 #include "asterisk/dsp.h"
 #include "asterisk/causes.h"
 #include "asterisk/stringfields.h"
+#include "asterisk/abstract_jb.h"
 #ifdef __cplusplus
 }
 #endif
@@ -104,6 +105,16 @@
 
 /* global debug flag */
 int h323debug;
+
+/*! Global jitterbuffer configuration - by default, jb is disabled */
+static struct ast_jb_conf default_jbconf =
+{
+	.flags = 0,
+	.max_size = -1,
+	.resync_threshold = -1,
+	.impl = ""
+};
+static struct ast_jb_conf global_jbconf;
 
 /** Variables required by Asterisk */
 static const char desc[] = "The NuFone Network's Open H.323 Channel Driver";
@@ -788,6 +799,10 @@
 				ch = NULL;
 			}
 		}
+
+		/* Configure the new channel jb */
+		if (ch && pvt && pvt->rtp)
+			ast_jb_configure(ch, &global_jbconf);
 	} else  {
 		ast_log(LOG_WARNING, "Unable to allocate channel structure\n");
 	}
@@ -2020,8 +2035,18 @@
 	global_options.dtmfmode = H323_DTMF_RFC2833;
 	global_options.capability = GLOBAL_CAPABILITY;
 	global_options.bridge = 1;		/* Do native bridging by default */
+
+	/* Copy the default jb config over global_jbconf */
+	memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf));
+
 	v = ast_variable_browse(cfg, "general");
-	while(v) {
+	while (v) {
+		/* handle jb conf */
+                if (!ast_jb_read_conf(&global_jbconf, v->name, v->value)) {
+			v = v->next;
+			continue;
+		}
+
 		/* Create the interface list */
 		if (!strcasecmp(v->name, "port")) {
 			h323_signalling_port = (int)strtol(v->value, NULL, 10);

Modified: team/north/chan_skinny-fixup/channels/chan_jingle.c
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/channels/chan_jingle.c?rev=31465&r1=31464&r2=31465&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/channels/chan_jingle.c (original)
+++ team/north/chan_skinny-fixup/channels/chan_jingle.c Thu Jun  1 13:20:25 2006
@@ -69,10 +69,21 @@
 #include "asterisk/utils.h"
 #include "asterisk/causes.h"
 #include "asterisk/astobj.h"
+#include "asterisk/abstract_jb.h"
 #include "asterisk/jabber.h"
 #include "asterisk/jingle.h"
 
 #define JINGLE_CONFIG "jingle.conf"
+
+/*! Global jitterbuffer configuration - by default, jb is disabled */
+static struct ast_jb_conf default_jbconf =
+{
+	.flags = 0,
+	.max_size = -1,
+	.resync_threshold = -1,
+	.impl = ""
+};
+static struct ast_jb_conf global_jbconf;
 
 enum jingle_protocol {
 	AJI_PROTOCOL_UDP = 1,
@@ -773,6 +784,11 @@
 		ast_hangup(tmp);
 		tmp = NULL;
 	}
+
+	/* Configure the new channel jb */
+	if (tmp && i && i->rtp)
+		ast_jb_configure(tmp, &global_jbconf);
+
 	return tmp;
 }
 
@@ -1453,8 +1469,15 @@
 		return 0;
 	}
 
+	/* Copy the default jb config over global_jbconf */
+	memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf));
+
 	cat = ast_category_browse(cfg, NULL);
 	for (var = ast_variable_browse(cfg, "general"); var; var = var->next) {
+		/* handle jb conf */
+		if (!ast_jb_read_conf(&global_jbconf, var->name, var->value))
+			continue;
+
 		if (!strcasecmp(var->name, "allowguest"))
 			allowguest =
 				(ast_true(ast_variable_retrieve(cfg, "general", "allowguest"))) ? 1 : 0;

Modified: team/north/chan_skinny-fixup/channels/chan_mgcp.c
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/channels/chan_mgcp.c?rev=31465&r1=31464&r2=31465&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/channels/chan_mgcp.c (original)
+++ team/north/chan_skinny-fixup/channels/chan_mgcp.c Thu Jun  1 13:20:25 2006
@@ -117,6 +117,7 @@
 #include "asterisk/dsp.h"
 #include "asterisk/devicestate.h"
 #include "asterisk/stringfields.h"
+#include "asterisk/abstract_jb.h"
 
 #ifndef IPTOS_MINCOST
 #define IPTOS_MINCOST 0x02
@@ -136,6 +137,16 @@
 #ifndef INADDR_NONE
 #define INADDR_NONE (in_addr_t)(-1)
 #endif
+
+/*! Global jitterbuffer configuration - by default, jb is disabled */
+static struct ast_jb_conf default_jbconf =
+{
+	.flags = 0,
+	.max_size = -1,
+	.resync_threshold = -1,
+	.impl = ""
+};
+static struct ast_jb_conf global_jbconf;
 
 static const char tdesc[] = "Media Gateway Control Protocol (MGCP)";
 static const char config[] = "mgcp.conf";
@@ -353,10 +364,6 @@
 			This should be obsoleted */
 	char cxident[80];
 	char callid[80];
-/* SC: obsolete
-	time_t lastouttime;
-	int lastout;
-*/
 	int cxmode;
 	struct mgcp_request *cx_queue; /*!< SC: pending CX commands */
 	ast_mutex_t cx_queue_lock;     /*!< SC: CX queue lock */
@@ -364,10 +371,6 @@
 	int iseq; /* Not used? RTP? */
 	int outgoing;
 	int alreadygone;
-/* SC: obsolete
-	int messagepending;
-	struct mgcp_message *msgs;
-*/
 	struct mgcp_subchannel *next; /* for out circular linked list */
 };
 
@@ -1499,6 +1502,10 @@
 			ast_verbose(VERBOSE_PREFIX_3 "MGCP mgcp_new(%s) created in state: %s\n",
 				tmp->name, ast_state2str(state));
 		}
+
+		/* Configure the new channel jb */
+		if (tmp && sub && sub->rtp)
+			ast_jb_configure(tmp, &global_jbconf);
 	} else {
 		ast_log(LOG_WARNING, "Unable to allocate channel structure\n");
 	}
@@ -4165,8 +4172,18 @@
 	}
 	memset(&bindaddr, 0, sizeof(bindaddr));
 	dtmfmode = 0;
+
+	/* Copy the default jb config over global_jbconf */
+	memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf));
+
 	v = ast_variable_browse(cfg, "general");
-	while(v) {
+	while (v) {
+		/* handle jb conf */
+		if (!ast_jb_read_conf(&global_jbconf, v->name, v->value)) {
+			v = v->next;
+			continue;
+		}
+
 		/* Create the interface list */
 		if (!strcasecmp(v->name, "bindaddr")) {
 			if (!(hp = ast_gethostbyname(v->value, &ahp))) {

Modified: team/north/chan_skinny-fixup/channels/chan_oss.c
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/channels/chan_oss.c?rev=31465&r1=31464&r2=31465&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/channels/chan_oss.c (original)
+++ team/north/chan_skinny-fixup/channels/chan_oss.c Thu Jun  1 13:20:25 2006
@@ -156,13 +156,9 @@
     ; jbenable = yes              ; Enables the use of a jitterbuffer on the receiving side of an
                                   ; OSS channel. Defaults to "no". An enabled jitterbuffer will
                                   ; be used only if the sending side can create and the receiving
-                                  ; side can not accept jitter. The ZAP channel can't accept jitter,
-                                  ; thus an enabled jitterbuffer on the receive ZAP side will always
-                                  ; be used if the sending side can create jitter or if ZAP jb is
-                                  ; forced.
-
-    ; jbforce = no                ; Forces the use of a jitterbuffer on the receive side of a ZAP
-                                  ; channel. Defaults to "no".
+                                  ; side can not accept jitter. The OSS channel can't accept jitter,
+                                  ; thus an enabled jitterbuffer on the receive OSS side will always
+                                  ; be used if the sending side can create jitter.
 
     ; jbmaxsize = 200             ; Max length of the jitterbuffer in milliseconds.
 
@@ -171,8 +167,8 @@
                                   ; big jumps in/broken timestamps, usualy sent from exotic devices
                                   ; and programs. Defaults to 1000.
 
-    ; jbimpl = fixed              ; Jitterbuffer implementation, used on the receiving side of a SIP
-                                  ; channel. Two implementation are currenlty available - "fixed"
+    ; jbimpl = fixed              ; Jitterbuffer implementation, used on the receiving side of an OSS
+                                  ; channel. Two implementations are currenlty available - "fixed"
                                   ; (with size always equals to jbmax-size) and "adaptive" (with
                                   ; variable size, actually the new jb of IAX2). Defaults to fixed.
 

Modified: team/north/chan_skinny-fixup/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/channels/chan_sip.c?rev=31465&r1=31464&r2=31465&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/channels/chan_sip.c (original)
+++ team/north/chan_skinny-fixup/channels/chan_sip.c Thu Jun  1 13:20:25 2006
@@ -857,7 +857,6 @@
 	struct ast_variable *chanvars;		/*!< Channel variables to set for inbound call */
 	struct sip_pvt *next;			/*!< Next dialog in chain */
 	struct sip_invite_param *options;	/*!< Options for INVITE */
-	struct ast_jb_conf jbconf;
 } *iflist = NULL;
 
 #define FLAG_RESPONSE (1 << 0)
@@ -1367,7 +1366,7 @@
 	unsigned int profile = 0;
 	int i, found;
 
-	if (!pvt || ast_strlen_zero(supported) )
+	if (ast_strlen_zero(supported) )
 		return 0;
 
 	if (option_debug > 2 && sipdebug)
@@ -1393,7 +1392,8 @@
 			ast_log(LOG_DEBUG, "Found no match for SIP option: %s (Please file bug report!)\n", next);
 	}
 
-	pvt->sipoptions = profile;
+	if (pvt)
+		pvt->sipoptions = profile;
 	return profile;
 }
 
@@ -3357,7 +3357,7 @@
 
 	/* Configure the new channel jb */
 	if (tmp && i && i->rtp)
-		ast_jb_configure(tmp, &i->jbconf);
+		ast_jb_configure(tmp, &global_jbconf);
 
 	return tmp;
 }
@@ -3692,9 +3692,6 @@
 	    (ast_test_flag(&p->flags[0], SIP_DTMF) == SIP_DTMF_AUTO))
 		p->noncodeccapability |= AST_RTP_DTMF;
 	ast_string_field_set(p, context, default_context);
-
-	/* Assign default jb conf to the new sip_pvt */
-	memcpy(&p->jbconf, &global_jbconf, sizeof(struct ast_jb_conf));
 
 	/* Add to active dialog list */
 	ast_mutex_lock(&iflock);

Modified: team/north/chan_skinny-fixup/channels/chan_skinny.c
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/channels/chan_skinny.c?rev=31465&r1=31464&r2=31465&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/channels/chan_skinny.c (original)
+++ team/north/chan_skinny-fixup/channels/chan_skinny.c Thu Jun  1 13:20:25 2006
@@ -902,7 +902,6 @@
 	int nat;
 	int outgoing;
 	int alreadygone;
-	struct ast_jb_conf jbconf;
 
 	struct skinny_line *next;
 	struct skinny_device *parent;
@@ -1789,9 +1788,6 @@
 					l->cxmode = SKINNY_CX_INACTIVE;
 					l->nat = nat;
 
-					/* Assign default jb conf to the new skinny_line */
-					memcpy(&l->jbconf, &global_jbconf, sizeof(struct ast_jb_conf));
-
 					l->next = d->lines;
 					d->lines = l;
 				} else {
@@ -2437,7 +2433,7 @@
 
 		/* Configure the new channel jb */
 		if (tmp && l && l->rtp)
-			ast_jb_configure(tmp, &l->jbconf);
+			ast_jb_configure(tmp, &global_jbconf);
 	} else {
 		ast_log(LOG_WARNING, "Unable to allocate channel structure\n");
 	}
@@ -3897,7 +3893,7 @@
 
 	/* load the general section */
 	v = ast_variable_browse(cfg, "general");
-	while(v) {
+	while (v) {
 		/* handle jb conf */
 		if (!ast_jb_read_conf(&global_jbconf, v->name, v->value)) {
 			v = v->next;

Modified: team/north/chan_skinny-fixup/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/channels/chan_zap.c?rev=31465&r1=31464&r2=31465&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/channels/chan_zap.c (original)
+++ team/north/chan_skinny-fixup/channels/chan_zap.c Thu Jun  1 13:20:25 2006
@@ -698,8 +698,6 @@
 #endif	
 	int polarity;
 	int dsp_features;
-	struct ast_jb_conf jbconf;
-
 } *iflist = NULL, *ifend = NULL;
 
 static struct ast_channel *zt_request(const char *type, int format, void *data, int *cause);
@@ -5215,7 +5213,7 @@
 		ast_log(LOG_WARNING, "Unable to allocate channel structure\n");
 	/* Configure the new channel jb */
 	if (tmp && i)
-		ast_jb_configure(tmp, &i->jbconf);
+		ast_jb_configure(tmp, &global_jbconf);
 	return tmp;
 }
 
@@ -7011,8 +7009,6 @@
 		for (x = 0; x < 3; x++)
 			tmp->subs[x].zfd = -1;
 		tmp->channel = channel;
-		/* Assign default jb conf to the new zt_pvt */
-		memcpy(&tmp->jbconf, &global_jbconf, sizeof(struct ast_jb_conf));
 	}
 
 	if (tmp) {

Modified: team/north/chan_skinny-fixup/channels/h323/h323.conf.sample
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/channels/h323/h323.conf.sample?rev=31465&r1=31464&r2=31465&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/channels/h323/h323.conf.sample (original)
+++ team/north/chan_skinny-fixup/channels/h323/h323.conf.sample Thu Jun  1 13:20:25 2006
@@ -63,6 +63,32 @@
 ; use user authentication at all.
 ;
 ;context=default
+;------------------------------ JITTER BUFFER CONFIGURATION --------------------------
+; jbenable = yes              ; Enables the use of a jitterbuffer on the receiving side of a
+                              ; H323 channel. Defaults to "no". An enabled jitterbuffer will
+                              ; be used only if the sending side can create and the receiving
+                              ; side can not accept jitter. The H323 channel can accept jitter,
+                              ; thus an enabled jitterbuffer on the receive H323 side will only
+                              ; be used if the sending side can create jitter and jbforce is
+                              ; also set to yes.
+
+; jbforce = no                ; Forces the use of a jitterbuffer on the receive side of a H323
+                              ; channel. Defaults to "no".
+
+; jbmaxsize = 200             ; Max length of the jitterbuffer in milliseconds.
+
+; jbresyncthreshold = 1000    ; Jump in the frame timestamps over which the jitterbuffer is
+                              ; resynchronized. Useful to improve the quality of the voice, with
+                              ; big jumps in/broken timestamps, usualy sent from exotic devices
+                              ; and programs. Defaults to 1000.
+
+; jbimpl = fixed              ; Jitterbuffer implementation, used on the receiving side of a H323
+                              ; channel. Two implementations are currenlty available - "fixed"
+                              ; (with size always equals to jbmax-size) and "adaptive" (with
+                              ; variable size, actually the new jb of IAX2). Defaults to fixed.
+
+; jblog = no                  ; Enables jitterbuffer frame logging. Defaults to "no".
+;-----------------------------------------------------------------------------------
 ;
 ; H.323 Alias definitions
 ;

Modified: team/north/chan_skinny-fixup/channels/misdn/isdn_lib.c
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/channels/misdn/isdn_lib.c?rev=31465&r1=31464&r2=31465&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/channels/misdn/isdn_lib.c (original)
+++ team/north/chan_skinny-fixup/channels/misdn/isdn_lib.c Thu Jun  1 13:20:25 2006
@@ -166,7 +166,7 @@
 void te_lib_destroy(int midev) ;
 struct misdn_bchannel *manager_find_bc_by_pid(int pid);
 struct misdn_bchannel *manager_find_bc_holded(struct misdn_bchannel* bc);
-void manager_ph_control_block(struct misdn_bchannel *bc, long c1, void *c2, int c2_len);
+void manager_ph_control_block(struct misdn_bchannel *bc, int c1, void *c2, int c2_len);
 void manager_clean_bc(struct misdn_bchannel *bc );
 void manager_bchannel_setup (struct misdn_bchannel *bc);
 void manager_bchannel_cleanup (struct misdn_bchannel *bc);
@@ -3677,17 +3677,17 @@
 /*
  * send control information to the channel (dsp-module)
  */
-void manager_ph_control(struct misdn_bchannel *bc, long c1, long c2)
-{
-	unsigned char buffer[mISDN_HEADER_LEN+2*sizeof(long)];
+void manager_ph_control(struct misdn_bchannel *bc, int c1, int c2)
+{
+	unsigned char buffer[mISDN_HEADER_LEN+2*sizeof(int)];
 	iframe_t *ctrl = (iframe_t *)buffer; /* preload data */
-	unsigned long *d = (unsigned long *)&ctrl->data.p;
+	unsigned int *d = (unsigned int*)&ctrl->data.p;
 	struct misdn_stack *stack=get_stack_by_bc(bc);
 	
 	ctrl->prim = PH_CONTROL | REQUEST;
 	ctrl->addr = bc->addr | FLG_MSG_DOWN;
 	ctrl->dinfo = 0;
-	ctrl->len = sizeof(unsigned long)*2;
+	ctrl->len = sizeof(unsigned int)*2;
 	*d++ = c1;
 	*d++ = c2;
 	mISDN_write(stack->midev, ctrl, mISDN_HEADER_LEN+ctrl->len, TIMEOUT_1SEC);
@@ -3696,17 +3696,17 @@
 /*
  * send control information to the channel (dsp-module)
  */
-void manager_ph_control_block(struct misdn_bchannel *bc, long c1, void *c2, int c2_len)
-{
-	unsigned char buffer[mISDN_HEADER_LEN+sizeof(long)+c2_len];
+void manager_ph_control_block(struct misdn_bchannel *bc, int c1, void *c2, int c2_len)
+{
+	unsigned char buffer[mISDN_HEADER_LEN+sizeof(int)+c2_len];
 	iframe_t *ctrl = (iframe_t *)buffer;
-	unsigned long *d = (unsigned long *)&ctrl->data.p;
+	unsigned int *d = (unsigned int *)&ctrl->data.p;
 	struct misdn_stack *stack=get_stack_by_bc(bc);
 	
 	ctrl->prim = PH_CONTROL | REQUEST;
 	ctrl->addr = bc->addr | FLG_MSG_DOWN;
 	ctrl->dinfo = 0;
-	ctrl->len = sizeof(unsigned long) + c2_len;
+	ctrl->len = sizeof(unsigned int) + c2_len;
 	*d++ = c1;
 	memcpy(d, c2, c2_len);
 	mISDN_write(stack->midev, ctrl, mISDN_HEADER_LEN+ctrl->len, TIMEOUT_1SEC);

Modified: team/north/chan_skinny-fixup/channels/misdn/isdn_lib.h
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/channels/misdn/isdn_lib.h?rev=31465&r1=31464&r2=31465&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/channels/misdn/isdn_lib.h (original)
+++ team/north/chan_skinny-fixup/channels/misdn/isdn_lib.h Thu Jun  1 13:20:25 2006
@@ -350,7 +350,7 @@
 
 int misdn_lib_tx2misdn_frm(struct misdn_bchannel *bc, void *data, int len);
 
-void manager_ph_control(struct misdn_bchannel *bc, long c1, long c2);
+void manager_ph_control(struct misdn_bchannel *bc, int c1, int c2);
 
 
 int misdn_lib_port_restart(int port);

Modified: team/north/chan_skinny-fixup/configs/alsa.conf.sample
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/configs/alsa.conf.sample?rev=31465&r1=31464&r2=31465&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/configs/alsa.conf.sample (original)
+++ team/north/chan_skinny-fixup/configs/alsa.conf.sample Thu Jun  1 13:20:25 2006
@@ -34,13 +34,9 @@
 ; jbenable = yes              ; Enables the use of a jitterbuffer on the receiving side of an
                               ; ALSA channel. Defaults to "no". An enabled jitterbuffer will
                               ; be used only if the sending side can create and the receiving
-                              ; side can not accept jitter. The ZAP channel can't accept jitter,
-                              ; thus an enabled jitterbuffer on the receive ZAP side will always
-                              ; be used if the sending side can create jitter or if ZAP jb is
-                              ; forced.
-
-; jbforce = no                ; Forces the use of a jitterbuffer on the receive side of a ZAP
-                              ; channel. Defaults to "no".
+                              ; side can not accept jitter. The ALSA channel can't accept jitter,
+                              ; thus an enabled jitterbuffer on the receive ALSA side will always
+                              ; be used if the sending side can create jitter.
 
 ; jbmaxsize = 200             ; Max length of the jitterbuffer in milliseconds.
 

Modified: team/north/chan_skinny-fixup/configs/mgcp.conf.sample
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/configs/mgcp.conf.sample?rev=31465&r1=31464&r2=31465&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/configs/mgcp.conf.sample (original)
+++ team/north/chan_skinny-fixup/configs/mgcp.conf.sample Thu Jun  1 13:20:25 2006
@@ -4,6 +4,33 @@
 [general]
 ;port = 2427
 ;bindaddr = 0.0.0.0
+
+;------------------------------ JITTER BUFFER CONFIGURATION --------------------------
+; jbenable = yes              ; Enables the use of a jitterbuffer on the receiving side of a
+                              ; MGCP channel. Defaults to "no". An enabled jitterbuffer will
+                              ; be used only if the sending side can create and the receiving
+                              ; side can not accept jitter. The MGCP channel can accept jitter,
+                              ; thus an enabled jitterbuffer on the receive MGCP side will only
+                              ; be used if the sending side can create jitter and jbforce is
+                              ; also set to yes.
+
+; jbforce = no                ; Forces the use of a jitterbuffer on the receive side of a MGCP
+                              ; channel. Defaults to "no".
+
+; jbmaxsize = 200             ; Max length of the jitterbuffer in milliseconds.
+
+; jbresyncthreshold = 1000    ; Jump in the frame timestamps over which the jitterbuffer is
+                              ; resynchronized. Useful to improve the quality of the voice, with
+                              ; big jumps in/broken timestamps, usualy sent from exotic devices
+                              ; and programs. Defaults to 1000.
+
+; jbimpl = fixed              ; Jitterbuffer implementation, used on the receiving side of a MGCP
+                              ; channel. Two implementations are currenlty available - "fixed"
+                              ; (with size always equals to jbmax-size) and "adaptive" (with
+                              ; variable size, actually the new jb of IAX2). Defaults to fixed.
+
+; jblog = no                  ; Enables jitterbuffer frame logging. Defaults to "no".
+;-----------------------------------------------------------------------------------
 
 ;[dlinkgw]
 ;host = 192.168.0.64

Modified: team/north/chan_skinny-fixup/configs/oss.conf.sample
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/configs/oss.conf.sample?rev=31465&r1=31464&r2=31465&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/configs/oss.conf.sample (original)
+++ team/north/chan_skinny-fixup/configs/oss.conf.sample Thu Jun  1 13:20:25 2006
@@ -50,13 +50,9 @@
     ; jbenable = yes              ; Enables the use of a jitterbuffer on the receiving side of an
                                   ; OSS channel. Defaults to "no". An enabled jitterbuffer will
                                   ; be used only if the sending side can create and the receiving
-                                  ; side can not accept jitter. The ZAP channel can't accept jitter,
-                                  ; thus an enabled jitterbuffer on the receive ZAP side will always
-                                  ; be used if the sending side can create jitter or if ZAP jb is
-                                  ; forced.
-
-    ; jbforce = no                ; Forces the use of a jitterbuffer on the receive side of a ZAP
-                                  ; channel. Defaults to "no".
+                                  ; side can not accept jitter. The OSS channel can't accept jitter,
+                                  ; thus an enabled jitterbuffer on the receive OSS side will always
+                                  ; be used if the sending side can create jitter.
 
     ; jbmaxsize = 200             ; Max length of the jitterbuffer in milliseconds.
 
@@ -65,8 +61,8 @@
                                   ; big jumps in/broken timestamps, usualy sent from exotic devices
                                   ; and programs. Defaults to 1000.
 
-    ; jbimpl = fixed              ; Jitterbuffer implementation, used on the receiving side of a SIP
-                                  ; channel. Two implementation are currenlty available - "fixed"
+    ; jbimpl = fixed              ; Jitterbuffer implementation, used on the receiving side of an OSS
+                                  ; channel. Two implementations are currenlty available - "fixed"
                                   ; (with size always equals to jbmax-size) and "adaptive" (with
                                   ; variable size, actually the new jb of IAX2). Defaults to fixed.
 

Modified: team/north/chan_skinny-fixup/configs/sip.conf.sample
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/configs/sip.conf.sample?rev=31465&r1=31464&r2=31465&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/configs/sip.conf.sample (original)
+++ team/north/chan_skinny-fixup/configs/sip.conf.sample Thu Jun  1 13:20:25 2006
@@ -321,7 +321,7 @@
                               ; and programs. Defaults to 1000.
 
 ; jbimpl = fixed              ; Jitterbuffer implementation, used on the receiving side of a SIP
-                              ; channel. Two implementation are currenlty available - "fixed"
+                              ; channel. Two implementations are currenlty available - "fixed"
                               ; (with size always equals to jbmaxsize) and "adaptive" (with
                               ; variable size, actually the new jb of IAX2). Defaults to fixed.
 

Modified: team/north/chan_skinny-fixup/configs/skinny.conf.sample
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/configs/skinny.conf.sample?rev=31465&r1=31464&r2=31465&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/configs/skinny.conf.sample (original)
+++ team/north/chan_skinny-fixup/configs/skinny.conf.sample Thu Jun  1 13:20:25 2006
@@ -29,7 +29,7 @@
                              ; and programs. Defaults to 1000.
 
 ;jbimpl = fixed              ; Jitterbuffer implementation, used on the receiving side of a
-                             ; skinny channel. Two implementation are currently available
+                             ; skinny channel. Two implementations are currently available
                              ; - "fixed" (with size always equals to jbmaxsize)
                              ; - "adaptive" (with variable size, actually the new jb of IAX2).
                              ; Defaults to fixed.

Modified: team/north/chan_skinny-fixup/configs/zapata.conf.sample
URL: http://svn.digium.com/view/asterisk/team/north/chan_skinny-fixup/configs/zapata.conf.sample?rev=31465&r1=31464&r2=31465&view=diff
==============================================================================
--- team/north/chan_skinny-fixup/configs/zapata.conf.sample (original)
+++ team/north/chan_skinny-fixup/configs/zapata.conf.sample Thu Jun  1 13:20:25 2006
@@ -501,11 +501,7 @@
                               ; be used only if the sending side can create and the receiving
                               ; side can not accept jitter. The ZAP channel can't accept jitter,
                               ; thus an enabled jitterbuffer on the receive ZAP side will always
-                              ; be used if the sending side can create jitter or if ZAP jb is
-                              ; forced.
-
-; jbforce = no                ; Forces the use of a jitterbuffer on the receive side of a ZAP
-                              ; channel. Defaults to "no".
+                              ; be used if the sending side can create jitter.
 
 ; jbmaxsize = 200             ; Max length of the jitterbuffer in milliseconds.
 
@@ -514,8 +510,8 @@
                               ; big jumps in/broken timestamps, usualy sent from exotic devices
                               ; and programs. Defaults to 1000.
 
-; jbimpl = fixed              ; Jitterbuffer implementation, used on the receiving side of a SIP
-                              ; channel. Two implementation are currenlty available - "fixed"
+; jbimpl = fixed              ; Jitterbuffer implementation, used on the receiving side of a ZAP
+                              ; channel. Two implementations are currenlty available - "fixed"
                               ; (with size always equals to jbmax-size) and "adaptive" (with
                               ; variable size, actually the new jb of IAX2). Defaults to fixed.
 



More information about the svn-commits mailing list