diff options
Diffstat (limited to 'channels/chan_skinny.c')
| -rw-r--r-- | channels/chan_skinny.c | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/channels/chan_skinny.c b/channels/chan_skinny.c index 95b878802..adaacd21b 100644 --- a/channels/chan_skinny.c +++ b/channels/chan_skinny.c @@ -226,14 +226,15 @@ static char version_id[16] = "P002F202"; #endif #endif -/*! Global jitterbuffer configuration - by default, jb is disabled */ +/*! Global jitterbuffer configuration - by default, jb is disabled + * \note Values shown here match the defaults shown in skinny.conf.sample */ static struct ast_jb_conf default_jbconf = { .flags = 0, - .max_size = -1, - .resync_threshold = -1, - .impl = "", - .target_extra = -1, + .max_size = 200, + .resync_threshold = 1000, + .impl = "fixed", + .target_extra = 40, }; static struct ast_jb_conf global_jbconf; @@ -1377,15 +1378,6 @@ static struct skinny_device_options *default_device = &default_device_struct; static AST_LIST_HEAD_STATIC(devices, skinny_device); -/*static struct ast_jb_conf default_jbconf = -{ - .flags = 0, - .max_size = -1, - .resync_threshold = -1, - .impl = "" -}; -static struct ast_jb_conf global_jbconf;*/ - struct skinnysession { pthread_t t; ast_mutex_t lock; @@ -3843,12 +3835,17 @@ static char *handle_skinny_show_settings(struct ast_cli_entry *e, int cmd, struc ast_cli(a->fd, " Date Format: %s\n", date_format); ast_cli(a->fd, " Voice Mail Extension: %s\n", S_OR(global_vmexten, "(not set)")); ast_cli(a->fd, " Reg. context: %s\n", S_OR(regcontext, "(not set)")); - ast_cli(a->fd, " Jitterbuffer enabled: %s\n", (ast_test_flag(&global_jbconf, AST_JB_ENABLED) ? "Yes" : "No")); - ast_cli(a->fd, " Jitterbuffer forced: %s\n", (ast_test_flag(&global_jbconf, AST_JB_FORCED) ? "Yes" : "No")); - ast_cli(a->fd, " Jitterbuffer max size: %ld\n", global_jbconf.max_size); - ast_cli(a->fd, " Jitterbuffer resync: %ld\n", global_jbconf.resync_threshold); - ast_cli(a->fd, " Jitterbuffer impl: %s\n", global_jbconf.impl); - ast_cli(a->fd, " Jitterbuffer log: %s\n", (ast_test_flag(&global_jbconf, AST_JB_LOG) ? "Yes" : "No")); + ast_cli(a->fd, " Jitterbuffer enabled: %s\n", AST_CLI_YESNO(ast_test_flag(&global_jbconf, AST_JB_ENABLED))); + if (ast_test_flag(&global_jbconf, AST_JB_ENABLED)) { + ast_cli(a->fd, " Jitterbuffer forced: %s\n", AST_CLI_YESNO(ast_test_flag(&global_jbconf, AST_JB_FORCED))); + ast_cli(a->fd, " Jitterbuffer max size: %ld\n", global_jbconf.max_size); + ast_cli(a->fd, " Jitterbuffer resync: %ld\n", global_jbconf.resync_threshold); + ast_cli(a->fd, " Jitterbuffer impl: %s\n", global_jbconf.impl); + if (!strcasecmp(global_jbconf.impl, "adaptive")) { + ast_cli(a->fd, " Jitterbuffer tgt extra: %ld\n", global_jbconf.target_extra); + } + ast_cli(a->fd, " Jitterbuffer log: %s\n", AST_CLI_YESNO(ast_test_flag(&global_jbconf, AST_JB_LOG))); + } return CLI_SUCCESS; } |