[asterisk-commits] dvossel: branch 1.6.0 r249907 - in /branches/1.6.0: ./ channels/ configs/ inc...
SVN commits to the Asterisk project
asterisk-commits at lists.digium.com
Tue Mar 2 13:20:09 CST 2010
Author: dvossel
Date: Tue Mar 2 13:20:05 2010
New Revision: 249907
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=249907
Log:
Merged revisions 249893 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r249893 | dvossel | 2010-03-02 13:08:38 -0600 (Tue, 02 Mar 2010) | 11 lines
fixes adaptive jitterbuffer configuration
When configuring the adaptive jitterbuffer, the target_extra
value not only could not be set from the configuration, but was
not even being set to its proper default. This value is required
in order for the adaptive jitterbuffer to work correctly. To resolve
this a config option has been added to expose this value to the conf
files, and a default value is provided when no config specific value
is present.
........
Modified:
branches/1.6.0/ (props changed)
branches/1.6.0/channels/chan_alsa.c
branches/1.6.0/channels/chan_console.c
branches/1.6.0/channels/chan_dahdi.c
branches/1.6.0/channels/chan_gtalk.c
branches/1.6.0/channels/chan_h323.c
branches/1.6.0/channels/chan_jingle.c
branches/1.6.0/channels/chan_local.c
branches/1.6.0/channels/chan_mgcp.c
branches/1.6.0/channels/chan_oss.c
branches/1.6.0/channels/chan_sip.c
branches/1.6.0/channels/chan_skinny.c
branches/1.6.0/channels/chan_unistim.c
branches/1.6.0/channels/chan_usbradio.c
branches/1.6.0/channels/misdn_config.c
branches/1.6.0/configs/alsa.conf.sample
branches/1.6.0/configs/chan_dahdi.conf.sample
branches/1.6.0/configs/console.conf.sample
branches/1.6.0/configs/mgcp.conf.sample
branches/1.6.0/configs/misdn.conf.sample
branches/1.6.0/configs/oss.conf.sample
branches/1.6.0/configs/sip.conf.sample
branches/1.6.0/configs/usbradio.conf.sample
branches/1.6.0/include/asterisk/abstract_jb.h
branches/1.6.0/main/abstract_jb.c
Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.
Modified: branches/1.6.0/channels/chan_alsa.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_alsa.c?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/channels/chan_alsa.c (original)
+++ branches/1.6.0/channels/chan_alsa.c Tue Mar 2 13:20:05 2010
@@ -62,7 +62,8 @@
.flags = 0,
.max_size = -1,
.resync_threshold = -1,
- .impl = ""
+ .impl = "",
+ .target_extra = -1,
};
static struct ast_jb_conf global_jbconf;
Modified: branches/1.6.0/channels/chan_console.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_console.c?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/channels/chan_console.c (original)
+++ branches/1.6.0/channels/chan_console.c Tue Mar 2 13:20:05 2010
@@ -175,7 +175,8 @@
.flags = 0,
.max_size = -1,
.resync_threshold = -1,
- .impl = ""
+ .impl = "",
+ .target_extra = -1,
};
static struct ast_jb_conf global_jbconf;
Modified: branches/1.6.0/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_dahdi.c?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/channels/chan_dahdi.c (original)
+++ branches/1.6.0/channels/chan_dahdi.c Tue Mar 2 13:20:05 2010
@@ -120,7 +120,8 @@
.flags = 0,
.max_size = -1,
.resync_threshold = -1,
- .impl = ""
+ .impl = "",
+ .target_extra = -1,
};
static struct ast_jb_conf global_jbconf;
Modified: branches/1.6.0/channels/chan_gtalk.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_gtalk.c?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/channels/chan_gtalk.c (original)
+++ branches/1.6.0/channels/chan_gtalk.c Tue Mar 2 13:20:05 2010
@@ -78,7 +78,8 @@
.flags = 0,
.max_size = -1,
.resync_threshold = -1,
- .impl = ""
+ .impl = "",
+ .target_extra = -1,
};
static struct ast_jb_conf global_jbconf;
Modified: branches/1.6.0/channels/chan_h323.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_h323.c?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/channels/chan_h323.c (original)
+++ branches/1.6.0/channels/chan_h323.c Tue Mar 2 13:20:05 2010
@@ -118,7 +118,8 @@
.flags = 0,
.max_size = -1,
.resync_threshold = -1,
- .impl = ""
+ .impl = "",
+ .target_extra = -1,
};
static struct ast_jb_conf global_jbconf;
Modified: branches/1.6.0/channels/chan_jingle.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_jingle.c?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/channels/chan_jingle.c (original)
+++ branches/1.6.0/channels/chan_jingle.c Tue Mar 2 13:20:05 2010
@@ -77,7 +77,8 @@
.flags = 0,
.max_size = -1,
.resync_threshold = -1,
- .impl = ""
+ .impl = "",
+ .target_extra = -1,
};
static struct ast_jb_conf global_jbconf;
Modified: branches/1.6.0/channels/chan_local.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_local.c?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/channels/chan_local.c (original)
+++ branches/1.6.0/channels/chan_local.c Tue Mar 2 13:20:05 2010
@@ -59,6 +59,7 @@
.max_size = -1,
.resync_threshold = -1,
.impl = "",
+ .target_extra = -1,
};
static struct ast_channel *local_request(const char *type, int format, void *data, int *cause);
Modified: branches/1.6.0/channels/chan_mgcp.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_mgcp.c?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/channels/chan_mgcp.c (original)
+++ branches/1.6.0/channels/chan_mgcp.c Tue Mar 2 13:20:05 2010
@@ -92,7 +92,8 @@
.flags = 0,
.max_size = -1,
.resync_threshold = -1,
- .impl = ""
+ .impl = "",
+ .target_extra = -1,
};
static struct ast_jb_conf global_jbconf;
Modified: branches/1.6.0/channels/chan_oss.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_oss.c?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/channels/chan_oss.c (original)
+++ branches/1.6.0/channels/chan_oss.c Tue Mar 2 13:20:05 2010
@@ -72,6 +72,7 @@
.max_size = -1,
.resync_threshold = -1,
.impl = "",
+ .target_extra = -1,
};
static struct ast_jb_conf global_jbconf;
Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Tue Mar 2 13:20:05 2010
@@ -252,7 +252,8 @@
.flags = 0,
.max_size = -1,
.resync_threshold = -1,
- .impl = ""
+ .impl = "",
+ .target_extra = -1,
};
static struct ast_jb_conf global_jbconf; /*!< Global jitterbuffer configuration */
Modified: branches/1.6.0/channels/chan_skinny.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_skinny.c?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/channels/chan_skinny.c (original)
+++ branches/1.6.0/channels/chan_skinny.c Tue Mar 2 13:20:05 2010
@@ -151,7 +151,8 @@
.flags = 0,
.max_size = -1,
.resync_threshold = -1,
- .impl = ""
+ .impl = "",
+ .target_extra = -1,
};
static struct ast_jb_conf global_jbconf;
Modified: branches/1.6.0/channels/chan_unistim.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_unistim.c?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/channels/chan_unistim.c (original)
+++ branches/1.6.0/channels/chan_unistim.c Tue Mar 2 13:20:05 2010
@@ -188,10 +188,11 @@
/*! \brief Global jitterbuffer configuration - by default, jb is disabled */
static struct ast_jb_conf default_jbconf =
{
- .flags = 0,
+ .flags = 0,
.max_size = -1,
.resync_threshold = -1,
- .impl = ""
+ .impl = "",
+ .target_extra = -1,
};
static struct ast_jb_conf global_jbconf;
Modified: branches/1.6.0/channels/chan_usbradio.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/chan_usbradio.c?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/channels/chan_usbradio.c (original)
+++ branches/1.6.0/channels/chan_usbradio.c Tue Mar 2 13:20:05 2010
@@ -131,6 +131,7 @@
.max_size = -1,
.resync_threshold = -1,
.impl = "",
+ .target_extra = -1,
};
static struct ast_jb_conf global_jbconf;
Modified: branches/1.6.0/channels/misdn_config.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/channels/misdn_config.c?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/channels/misdn_config.c (original)
+++ branches/1.6.0/channels/misdn_config.c Tue Mar 2 13:20:05 2010
@@ -57,6 +57,7 @@
.max_size = -1,
.resync_threshold = -1,
.impl = "",
+ .target_extra = -1,
};
static struct ast_jb_conf global_jbconf;
Modified: branches/1.6.0/configs/alsa.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/configs/alsa.conf.sample?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/configs/alsa.conf.sample (original)
+++ branches/1.6.0/configs/alsa.conf.sample Tue Mar 2 13:20:05 2010
@@ -57,6 +57,13 @@
; (with size always equals to jbmax-size) and "adaptive" (with
; variable size, actually the new jb of IAX2). Defaults to fixed.
+; jbtargetextra = 40 ; This option only affects the jb when 'jbimpl = adaptive' is set.
+ ; The option represents the number of milliseconds by which the new
+ ; jitter buffer will pad its size. the default is 40, so without
+ ; modification, the new jitter buffer will set its size to the jitter
+ ; value plus 40 milliseconds. increasing this value may help if your
+ ; network normally has low jitter, but occasionally has spikes.
+
; jblog = no ; Enables jitterbuffer frame logging. Defaults to "no".
;-----------------------------------------------------------------------------------
Modified: branches/1.6.0/configs/chan_dahdi.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/configs/chan_dahdi.conf.sample?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/configs/chan_dahdi.conf.sample (original)
+++ branches/1.6.0/configs/chan_dahdi.conf.sample Tue Mar 2 13:20:05 2010
@@ -763,6 +763,13 @@
; (with size always equals to jbmax-size) and "adaptive" (with
; variable size, actually the new jb of IAX2). Defaults to fixed.
+; jbtargetextra = 40 ; This option only affects the jb when 'jbimpl = adaptive' is set.
+ ; The option represents the number of milliseconds by which the new
+ ; jitter buffer will pad its size. the default is 40, so without
+ ; modification, the new jitter buffer will set its size to the jitter
+ ; value plus 40 milliseconds. increasing this value may help if your
+ ; network normally has low jitter, but occasionally has spikes.
+
; jblog = no ; Enables jitterbuffer frame logging. Defaults to "no".
;-----------------------------------------------------------------------------------
;
Modified: branches/1.6.0/configs/console.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/configs/console.conf.sample?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/configs/console.conf.sample (original)
+++ branches/1.6.0/configs/console.conf.sample Tue Mar 2 13:20:05 2010
@@ -64,6 +64,13 @@
; (with size always equals to jbmax-size) and "adaptive" (with
; variable size, actually the new jb of IAX2). Defaults to fixed.
+; jbtargetextra = 40 ; This option only affects the jb when 'jbimpl = adaptive' is set.
+ ; The option represents the number of milliseconds by which the new
+ ; jitter buffer will pad its size. the default is 40, so without
+ ; modification, the new jitter buffer will set its size to the jitter
+ ; value plus 40 milliseconds. increasing this value may help if your
+ ; network normally has low jitter, but occasionally has spikes.
+
; jblog = no ; Enables jitterbuffer frame logging. Defaults to "no".
;-----------------------------------------------------------------------------------
Modified: branches/1.6.0/configs/mgcp.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/configs/mgcp.conf.sample?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/configs/mgcp.conf.sample (original)
+++ branches/1.6.0/configs/mgcp.conf.sample Tue Mar 2 13:20:05 2010
@@ -34,6 +34,13 @@
; channel. Two implementations are currently available - "fixed"
; (with size always equals to jbmax-size) and "adaptive" (with
; variable size, actually the new jb of IAX2). Defaults to fixed.
+
+; jbtargetextra = 40 ; This option only affects the jb when 'jbimpl = adaptive' is set.
+ ; The option represents the number of milliseconds by which the new
+ ; jitter buffer will pad its size. the default is 40, so without
+ ; modification, the new jitter buffer will set its size to the jitter
+ ; value plus 40 milliseconds. increasing this value may help if your
+ ; network normally has low jitter, but occasionally has spikes.
; jblog = no ; Enables jitterbuffer frame logging. Defaults to "no".
;-----------------------------------------------------------------------------------
Modified: branches/1.6.0/configs/misdn.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/configs/misdn.conf.sample?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/configs/misdn.conf.sample (original)
+++ branches/1.6.0/configs/misdn.conf.sample Tue Mar 2 13:20:05 2010
@@ -158,6 +158,13 @@
; (with size always equals to jbmaxsize) and "adaptive" (with
; variable size, actually the new jb of IAX2). Defaults to fixed.
+; jbtargetextra = 40 ; This option only affects the jb when 'jbimpl = adaptive' is set.
+ ; The option represents the number of milliseconds by which the new
+ ; jitter buffer will pad its size. the default is 40, so without
+ ; modification, the new jitter buffer will set its size to the jitter
+ ; value plus 40 milliseconds. increasing this value may help if your
+ ; network normally has low jitter, but occasionally has spikes.
+
; jblog = no ; Enables jitterbuffer frame logging. Defaults to "no".
;-----------------------------------------------------------------------------------
Modified: branches/1.6.0/configs/oss.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/configs/oss.conf.sample?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/configs/oss.conf.sample (original)
+++ branches/1.6.0/configs/oss.conf.sample Tue Mar 2 13:20:05 2010
@@ -65,6 +65,13 @@
; channel. Two implementations are currently available - "fixed"
; (with size always equals to jbmax-size) and "adaptive" (with
; variable size, actually the new jb of IAX2). Defaults to fixed.
+
+ ; jbtargetextra = 40 ; This option only affects the jb when 'jbimpl = adaptive' is set.
+ ; The option represents the number of milliseconds by which the new
+ ; jitter buffer will pad its size. the default is 40, so without
+ ; modification, the new jitter buffer will set its size to the jitter
+ ; value plus 40 milliseconds. increasing this value may help if your
+ ; network normally has low jitter, but occasionally has spikes.
; jblog = no ; Enables jitterbuffer frame logging. Defaults to "no".
;-----------------------------------------------------------------------------------
Modified: branches/1.6.0/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/configs/sip.conf.sample?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/configs/sip.conf.sample (original)
+++ branches/1.6.0/configs/sip.conf.sample Tue Mar 2 13:20:05 2010
@@ -725,6 +725,13 @@
; channel. Two implementations are currently available - "fixed"
; (with size always equals to jbmaxsize) and "adaptive" (with
; variable size, actually the new jb of IAX2). Defaults to fixed.
+
+; jbtargetextra = 40 ; This option only affects the jb when 'jbimpl = adaptive' is set.
+ ; The option represents the number of milliseconds by which the new jitter buffer
+ ; will pad its size. the default is 40, so without modification, the new
+ ; jitter buffer will set its size to the jitter value plus 40 milliseconds.
+ ; increasing this value may help if your network normally has low jitter,
+ ; but occasionally has spikes.
; jblog = no ; Enables jitterbuffer frame logging. Defaults to "no".
;-----------------------------------------------------------------------------------
Modified: branches/1.6.0/configs/usbradio.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/configs/usbradio.conf.sample?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/configs/usbradio.conf.sample (original)
+++ branches/1.6.0/configs/usbradio.conf.sample Tue Mar 2 13:20:05 2010
@@ -48,6 +48,13 @@
; (with size always equals to jbmax-size) and "adaptive" (with
; variable size, actually the new jb of IAX2). Defaults to fixed.
+; jbtargetextra = 40 ; This option only affects the jb when 'jbimpl = adaptive' is set.
+ ; The option represents the number of milliseconds by which the new
+ ; jitter buffer will pad its size. the default is 40, so without
+ ; modification, the new jitter buffer will set its size to the jitter
+ ; value plus 40 milliseconds. increasing this value may help if your
+ ; network normally has low jitter, but occasionally has spikes.
+
; jblog = no ; Enables jitterbuffer frame logging. Defaults to "no".
;-----------------------------------------------------------------------------------
Modified: branches/1.6.0/include/asterisk/abstract_jb.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/include/asterisk/abstract_jb.h?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/include/asterisk/abstract_jb.h (original)
+++ branches/1.6.0/include/asterisk/abstract_jb.h Tue Mar 2 13:20:05 2010
@@ -57,9 +57,11 @@
/*! \brief Max size of the jitterbuffer implementation. */
long max_size;
/*! \brief Resynchronization threshold of the jitterbuffer implementation. */
- long resync_threshold;
+ long resync_threshold;
/*! \brief Name of the jitterbuffer implementation to be used. */
- char impl[AST_JB_IMPL_NAME_SIZE];
+ char impl[AST_JB_IMPL_NAME_SIZE];
+ /*! \brief amount of additional jitterbuffer adjustment */
+ long target_extra;
};
@@ -69,6 +71,7 @@
#define AST_JB_CONF_FORCE "force"
#define AST_JB_CONF_MAX_SIZE "maxsize"
#define AST_JB_CONF_RESYNCH_THRESHOLD "resyncthreshold"
+#define AST_JB_CONF_TARGET_EXTRA "targetextra"
#define AST_JB_CONF_IMPL "impl"
#define AST_JB_CONF_LOG "log"
Modified: branches/1.6.0/main/abstract_jb.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/main/abstract_jb.c?view=diff&rev=249907&r1=249906&r2=249907
==============================================================================
--- branches/1.6.0/main/abstract_jb.c (original)
+++ branches/1.6.0/main/abstract_jb.c Tue Mar 2 13:20:05 2010
@@ -584,6 +584,10 @@
} else if (!strcasecmp(name, AST_JB_CONF_IMPL)) {
if (!ast_strlen_zero(value))
snprintf(conf->impl, sizeof(conf->impl), "%s", value);
+ } else if (!strcasecmp(name, AST_JB_CONF_TARGET_EXTRA)) {
+ if (sscanf(value, "%30d", &tmp) == 1) {
+ conf->target_extra = tmp;
+ }
} else if (!strcasecmp(name, AST_JB_CONF_LOG)) {
ast_set2_flag(conf, ast_true(value), AST_JB_LOG);
} else {
@@ -730,6 +734,7 @@
jbconf.max_jitterbuf = general_config->max_size;
jbconf.resync_threshold = general_config->resync_threshold;
jbconf.max_contig_interp = 10;
+ jbconf.target_extra = general_config->target_extra;
jb_setconf(adaptivejb, &jbconf);
}
More information about the asterisk-commits
mailing list