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.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@249907 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
David Vossel
2010-03-02 19:20:05 +00:00
parent 0f9cce8464
commit 03012c2325
24 changed files with 91 additions and 13 deletions

View File

@@ -584,6 +584,10 @@ int ast_jb_read_conf(struct ast_jb_conf *conf, const char *varname, const char *
} 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 @@ static void *jb_create_adaptive(struct ast_jb_conf *general_config, long resynch
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);
}