diff options
-rw-r--r-- | channels/chan_alsa.c | 11 | ||||
-rw-r--r-- | channels/chan_console.c | 9 | ||||
-rw-r--r-- | channels/chan_dahdi.c | 11 | ||||
-rw-r--r-- | channels/chan_h323.c | 11 | ||||
-rw-r--r-- | channels/chan_mgcp.c | 11 | ||||
-rw-r--r-- | channels/chan_oss.c | 11 | ||||
-rw-r--r-- | channels/chan_sip.c | 26 | ||||
-rw-r--r-- | channels/chan_skinny.c | 37 | ||||
-rw-r--r-- | channels/chan_unistim.c | 11 | ||||
-rw-r--r-- | channels/chan_usbradio.c | 11 | ||||
-rw-r--r-- | channels/misdn_config.c | 11 |
11 files changed, 86 insertions, 74 deletions
diff --git a/channels/chan_alsa.c b/channels/chan_alsa.c index 58382881e..bfc75cc23 100644 --- a/channels/chan_alsa.c +++ b/channels/chan_alsa.c @@ -57,13 +57,14 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/musiconhold.h" #include "asterisk/poll-compat.h" -/*! 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 alsa.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; diff --git a/channels/chan_console.c b/channels/chan_console.c index c08e3e5ab..a5f22be2d 100644 --- a/channels/chan_console.c +++ b/channels/chan_console.c @@ -172,13 +172,14 @@ AST_RWLOCK_DEFINE_STATIC(active_lock); * \brief Global jitterbuffer configuration * * \note Disabled by default. + * \note Values shown here match the defaults shown in console.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; diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 80f0211d7..3e0fc2231 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -280,14 +280,15 @@ static const char * const lbostr[] = { "-22.5db (CSU)" }; -/*! 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 chan_dahdi.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; diff --git a/channels/chan_h323.c b/channels/chan_h323.c index ccc034872..07646652f 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -114,14 +114,15 @@ onhold_cb on_hold; int h323debug; /*!< global debug flag */ -/*! \brief Global jitterbuffer configuration - by default, jb is disabled */ +/*! \brief Global jitterbuffer configuration - by default, jb is disabled + * \note Values shown here match the defaults shown in h323.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; diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c index f71948bd4..293a2c1fe 100644 --- a/channels/chan_mgcp.c +++ b/channels/chan_mgcp.c @@ -93,14 +93,15 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define INADDR_NONE (in_addr_t)(-1) #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 mgcp.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; diff --git a/channels/chan_oss.c b/channels/chan_oss.c index 10b0ed0fd..67c55c592 100644 --- a/channels/chan_oss.c +++ b/channels/chan_oss.c @@ -65,14 +65,15 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "console_video.h" -/*! 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 oss.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; diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 84a5d7d12..2192facaa 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -563,14 +563,15 @@ static int unauth_sessions = 0; static int authlimit = DEFAULT_AUTHLIMIT; static int authtimeout = DEFAULT_AUTHTIMEOUT; -/*! \brief Global jitterbuffer configuration - by default, jb is disabled */ +/*! \brief Global jitterbuffer configuration - by default, jb is disabled + * \note Values shown here match the defaults shown in sip.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; /*!< Global jitterbuffer configuration */ @@ -17567,11 +17568,16 @@ static char *sip_show_settings(struct ast_cli_entry *e, int cmd, struct ast_cli_ ast_cli(a->fd, " 802.1p CoS RTP video: %d\n", global_cos_video); ast_cli(a->fd, " 802.1p CoS RTP text: %d\n", global_cos_text); ast_cli(a->fd, " Jitterbuffer enabled: %s\n", AST_CLI_YESNO(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); - ast_cli(a->fd, " Jitterbuffer log: %s\n", AST_CLI_YESNO(ast_test_flag(&global_jbconf, AST_JB_LOG))); + 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))); + } ast_cli(a->fd, "\nNetwork Settings:\n"); ast_cli(a->fd, "---------------------------\n"); 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; } diff --git a/channels/chan_unistim.c b/channels/chan_unistim.c index 8b0f23313..f4b92330e 100644 --- a/channels/chan_unistim.c +++ b/channels/chan_unistim.c @@ -187,14 +187,15 @@ static void dummy(char *unused, ...) return; } -/*! \brief Global jitterbuffer configuration - by default, jb is disabled */ +/*! \brief Global jitterbuffer configuration - by default, jb is disabled + * \note Values shown here match the defaults shown in unistim.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; diff --git a/channels/chan_usbradio.c b/channels/chan_usbradio.c index 73995dd07..925629f85 100644 --- a/channels/chan_usbradio.c +++ b/channels/chan_usbradio.c @@ -187,14 +187,15 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define EEPROM_TXCTCSSADJ 15 #define EEPROM_RXSQUELCHADJ 16 -/*! 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 usbradio.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; diff --git a/channels/misdn_config.c b/channels/misdn_config.c index e14f2adee..23c2c6d80 100644 --- a/channels/misdn_config.c +++ b/channels/misdn_config.c @@ -47,14 +47,15 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #define NUM_GEN_ELEMENTS (sizeof(gen_spec) / sizeof(struct misdn_cfg_spec)) #define NUM_PORT_ELEMENTS (sizeof(port_spec) / sizeof(struct misdn_cfg_spec)) -/*! 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 misdn.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; |