diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-05-05 22:55:09 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2011-05-05 22:55:09 +0000 |
| commit | abb3190939aad01856d119ff958b228e0667bd83 (patch) | |
| tree | 181bb7a96719ba7500b437401fb6ea4efac675a6 /channels/chan_oss.c | |
| parent | 25d6cdfb70f3477f6d47b7caf57ea454beb042d3 (diff) | |
Merged revisions 317478 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
........
r317478 | russell | 2011-05-05 17:53:45 -0500 (Thu, 05 May 2011) | 12 lines
Fix some consistency issues with jitterbuffer config.
Store the defaults noted in the sample config files in the jitterbuffer config
data structure. This makes the CLI commands that output these settings show
the right thing. Also only show the settings that are relevant in the settings
CLI commands, based on which jitterbuffer is selected and whether it's enabled.
(closes issue #19083)
Reported by: rgagnon
Patches:
issue-19083-trunk-r313139.diff uploaded by rgagnon (license 1202)
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@317479 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_oss.c')
| -rw-r--r-- | channels/chan_oss.c | 11 |
1 files changed, 6 insertions, 5 deletions
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; |