[svn-commits] branch group/rtpjitterbuffer r30860 - in
/team/group/rtpjitterbuffer: configs...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Tue May 30 11:06:09 MST 2006
Author: russell
Date: Tue May 30 13:06:09 2006
New Revision: 30860
URL: http://svn.digium.com/view/asterisk?rev=30860&view=rev
Log:
change the names of the jitterbuffer options to remove the dashes since none
of our other options have them. Also, add the jitterbuffer options documentation
to alsa.conf.sample since that channel driver supports a jitterbuffer on its
receiving side now as well.
jb-enable ==> jbenable
jb-force ==> jbforce
jb-max-size ==> jbmaxsize
jb-resynch-threshold ==> jbresyncthreshold
jb-impl ==> jbimpl
jb-log ==> jblog
Modified:
team/group/rtpjitterbuffer/configs/alsa.conf.sample
team/group/rtpjitterbuffer/configs/sip.conf.sample
team/group/rtpjitterbuffer/configs/zapata.conf.sample
team/group/rtpjitterbuffer/include/asterisk/abstract_jb.h
Modified: team/group/rtpjitterbuffer/configs/alsa.conf.sample
URL: http://svn.digium.com/view/asterisk/team/group/rtpjitterbuffer/configs/alsa.conf.sample?rev=30860&r1=30859&r2=30860&view=diff
==============================================================================
--- team/group/rtpjitterbuffer/configs/alsa.conf.sample (original)
+++ team/group/rtpjitterbuffer/configs/alsa.conf.sample Tue May 30 13:06:09 2006
@@ -29,3 +29,31 @@
; To set which ALSA device to use, change this parameter
;input_device=hw:0,0
;output_device=hw:0,0
+
+;------------------------------ JITTER BUFFER CONFIGURATION --------------------------
+; jbenable = yes ; Enables the use of a jitterbuffer on the receiving side of an
+ ; ALSA channel. Defaults to "no". An enabled jitterbuffer will
+ ; be used only if the sending side can create and the receiving
+ ; side can not accept jitter. The ZAP channel can't accept jitter,
+ ; thus an enabled jitterbuffer on the receive ZAP side will always
+ ; be used if the sending side can create jitter or if ZAP jb is
+ ; forced.
+
+; jbforce = no ; Forces the use of a jitterbuffer on the receive side of a ZAP
+ ; channel. Defaults to "no".
+
+; jbmaxsize = 200 ; Max length of the jitterbuffer in milliseconds.
+
+; jbresyncthreshold = 1000 ; Jump in the frame timestamps over which the jitterbuffer is
+ ; resynchronized. Useful to improve the quality of the voice, with
+ ; big jumps in/broken timestamps, usualy sent from exotic devices
+ ; and programs. Defaults to 1000.
+
+; jbimpl = fixed ; Jitterbuffer implementation, used on the receiving side of a SIP
+ ; channel. Two implementation are currenlty available - "fixed"
+ ; (with size always equals to jbmax-size) and "adaptive" (with
+ ; variable size, actually the new jb of IAX2). Defaults to fixed.
+
+; jblog = no ; Enables jitterbuffer frame logging. Defaults to "no".
+;-----------------------------------------------------------------------------------
+
Modified: team/group/rtpjitterbuffer/configs/sip.conf.sample
URL: http://svn.digium.com/view/asterisk/team/group/rtpjitterbuffer/configs/sip.conf.sample?rev=30860&r1=30859&r2=30860&view=diff
==============================================================================
--- team/group/rtpjitterbuffer/configs/sip.conf.sample (original)
+++ team/group/rtpjitterbuffer/configs/sip.conf.sample Tue May 30 13:06:09 2006
@@ -303,29 +303,29 @@
; account relationship with your server.
;------------------------------ JITTER BUFFER CONFIGURATION --------------------------
-; jb-enable = yes ; Enables the use of a jitterbuffer on the receiving side of a
+; jbenable = yes ; Enables the use of a jitterbuffer on the receiving side of a
; SIP channel. Defaults to "no". An enabled jitterbuffer will
; be used only if the sending side can create and the receiving
; side can not accept jitter. The SIP channel can accept jitter,
; thus a jitterbuffer on the receive SIP side will be used only
; if it is forced and enabled.
-; jb-force = no ; Forces the use of a jitterbuffer on the receive side of a SIP
+; jbforce = no ; Forces the use of a jitterbuffer on the receive side of a SIP
; channel. Defaults to "no".
-; jb-max-size = 200 ; Max length of the jitterbuffer in milliseconds.
-
-; jb-resynch-threshold = 1000 ; Jump in the frame timestamps over which the jitterbuffer is
+; jbmaxsize = 200 ; Max length of the jitterbuffer in milliseconds.
+
+; jbresyncthreshold = 1000 ; Jump in the frame timestamps over which the jitterbuffer is
; resynchronized. Useful to improve the quality of the voice, with
; big jumps in/broken timestamps, usualy sent from exotic devices
; and programs. Defaults to 1000.
-; jb-impl = fixed ; Jitterbuffer implementation, used on the receiving side of a SIP
+; jbimpl = fixed ; Jitterbuffer implementation, used on the receiving side of a SIP
; channel. Two implementation are currenlty available - "fixed"
- ; (with size always equals to jb-max-size) and "adaptive" (with
+ ; (with size always equals to jbmaxsize) and "adaptive" (with
; variable size, actually the new jb of IAX2). Defaults to fixed.
-; jb-log = no ; Enables jitterbuffer frame logging. Defaults to "no".
+; jblog = no ; Enables jitterbuffer frame logging. Defaults to "no".
;-----------------------------------------------------------------------------------
[authentication]
Modified: team/group/rtpjitterbuffer/configs/zapata.conf.sample
URL: http://svn.digium.com/view/asterisk/team/group/rtpjitterbuffer/configs/zapata.conf.sample?rev=30860&r1=30859&r2=30860&view=diff
==============================================================================
--- team/group/rtpjitterbuffer/configs/zapata.conf.sample (original)
+++ team/group/rtpjitterbuffer/configs/zapata.conf.sample Tue May 30 13:06:09 2006
@@ -496,7 +496,7 @@
;jitterbuffers=4
;
;------------------------------ JITTER BUFFER CONFIGURATION --------------------------
-; jb-enable = yes ; Enables the use of a jitterbuffer on the receiving side of a
+; jbenable = yes ; Enables the use of a jitterbuffer on the receiving side of a
; ZAP channel. Defaults to "no". An enabled jitterbuffer will
; be used only if the sending side can create and the receiving
; side can not accept jitter. The ZAP channel can't accept jitter,
@@ -504,22 +504,22 @@
; be used if the sending side can create jitter or if ZAP jb is
; forced.
-; jb-force = no ; Forces the use of a jitterbuffer on the receive side of a ZAP
+; jbforce = no ; Forces the use of a jitterbuffer on the receive side of a ZAP
; channel. Defaults to "no".
-; jb-max-size = 200 ; Max length of the jitterbuffer in milliseconds.
-
-; jb-resynch-threshold = 1000 ; Jump in the frame timestamps over which the jitterbuffer is
+; jbmaxsize = 200 ; Max length of the jitterbuffer in milliseconds.
+
+; jbresyncthreshold = 1000 ; Jump in the frame timestamps over which the jitterbuffer is
; resynchronized. Useful to improve the quality of the voice, with
; big jumps in/broken timestamps, usualy sent from exotic devices
; and programs. Defaults to 1000.
-; jb-impl = fixed ; Jitterbuffer implementation, used on the receiving side of a SIP
+; jbimpl = fixed ; Jitterbuffer implementation, used on the receiving side of a SIP
; channel. Two implementation are currenlty available - "fixed"
- ; (with size always equals to jb-max-size) and "adaptive" (with
+ ; (with size always equals to jbmax-size) and "adaptive" (with
; variable size, actually the new jb of IAX2). Defaults to fixed.
-; jb-log = no ; Enables jitterbuffer frame logging. Defaults to "no".
+; jblog = no ; Enables jitterbuffer frame logging. Defaults to "no".
;-----------------------------------------------------------------------------------
;
; You can define your own custom ring cadences here. You can define up to 8
Modified: team/group/rtpjitterbuffer/include/asterisk/abstract_jb.h
URL: http://svn.digium.com/view/asterisk/team/group/rtpjitterbuffer/include/asterisk/abstract_jb.h?rev=30860&r1=30859&r2=30860&view=diff
==============================================================================
--- team/group/rtpjitterbuffer/include/asterisk/abstract_jb.h (original)
+++ team/group/rtpjitterbuffer/include/asterisk/abstract_jb.h Tue May 30 13:06:09 2006
@@ -64,11 +64,11 @@
/* Jitterbuffer configuration property names */
-#define AST_JB_CONF_PREFIX "jb-"
+#define AST_JB_CONF_PREFIX "jb"
#define AST_JB_CONF_ENABLE "enable"
#define AST_JB_CONF_FORCE "force"
-#define AST_JB_CONF_MAX_SIZE "max-size"
-#define AST_JB_CONF_RESYNCH_THRESHOLD "resynch-threshold"
+#define AST_JB_CONF_MAX_SIZE "maxsize"
+#define AST_JB_CONF_RESYNCH_THRESHOLD "resyncthreshold"
#define AST_JB_CONF_IMPL "impl"
#define AST_JB_CONF_LOG "log"
More information about the svn-commits
mailing list