diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-01 16:47:28 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-06-01 16:47:28 +0000 |
commit | f796193575703618e2b05e84545e3354543a8276 (patch) | |
tree | 65c18318da656f3d8bdc20876d5774763985c46a /configs | |
parent | 9f95248be1f852e3b6d2171eb0d95c715471f881 (diff) |
- add the ability to configure forced jitterbuffers on h323, jingle,
and mgcp channels
- remove the jitterbuffer configuration from the pvt structures in
the sip, zap, and skinny channel drivers, as copying the same global
configuration into each pvt structure has no benefit.
- update and fix some typos in jitterbuffer related documentation
(issue #7257, north, with additional updates and modifications)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@31413 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'configs')
-rw-r--r-- | configs/alsa.conf.sample | 10 | ||||
-rw-r--r-- | configs/mgcp.conf.sample | 27 | ||||
-rw-r--r-- | configs/oss.conf.sample | 14 | ||||
-rw-r--r-- | configs/sip.conf.sample | 2 | ||||
-rw-r--r-- | configs/skinny.conf.sample | 2 | ||||
-rw-r--r-- | configs/zapata.conf.sample | 10 |
6 files changed, 40 insertions, 25 deletions
diff --git a/configs/alsa.conf.sample b/configs/alsa.conf.sample index bfe77101f..e39197719 100644 --- a/configs/alsa.conf.sample +++ b/configs/alsa.conf.sample @@ -34,13 +34,9 @@ extension=s ; 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". + ; side can not accept jitter. The ALSA channel can't accept jitter, + ; thus an enabled jitterbuffer on the receive ALSA side will always + ; be used if the sending side can create jitter. ; jbmaxsize = 200 ; Max length of the jitterbuffer in milliseconds. diff --git a/configs/mgcp.conf.sample b/configs/mgcp.conf.sample index 2279977d8..c80104e32 100644 --- a/configs/mgcp.conf.sample +++ b/configs/mgcp.conf.sample @@ -5,6 +5,33 @@ ;port = 2427 ;bindaddr = 0.0.0.0 +;------------------------------ JITTER BUFFER CONFIGURATION -------------------------- +; jbenable = yes ; Enables the use of a jitterbuffer on the receiving side of a + ; MGCP 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 MGCP channel can accept jitter, + ; thus an enabled jitterbuffer on the receive MGCP side will only + ; be used if the sending side can create jitter and jbforce is + ; also set to yes. + +; jbforce = no ; Forces the use of a jitterbuffer on the receive side of a MGCP + ; 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 MGCP + ; channel. Two implementations 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". +;----------------------------------------------------------------------------------- + ;[dlinkgw] ;host = 192.168.0.64 ;context = default diff --git a/configs/oss.conf.sample b/configs/oss.conf.sample index 6997ccb9c..ec42da771 100644 --- a/configs/oss.conf.sample +++ b/configs/oss.conf.sample @@ -50,13 +50,9 @@ ; jbenable = yes ; Enables the use of a jitterbuffer on the receiving side of an ; OSS 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". + ; side can not accept jitter. The OSS channel can't accept jitter, + ; thus an enabled jitterbuffer on the receive OSS side will always + ; be used if the sending side can create jitter. ; jbmaxsize = 200 ; Max length of the jitterbuffer in milliseconds. @@ -65,8 +61,8 @@ ; 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" + ; jbimpl = fixed ; Jitterbuffer implementation, used on the receiving side of an OSS + ; channel. Two implementations 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. diff --git a/configs/sip.conf.sample b/configs/sip.conf.sample index 67d6dd21f..2b898437b 100644 --- a/configs/sip.conf.sample +++ b/configs/sip.conf.sample @@ -321,7 +321,7 @@ srvlookup=yes ; Enable DNS SRV lookups on outbound calls ; and programs. Defaults to 1000. ; jbimpl = fixed ; Jitterbuffer implementation, used on the receiving side of a SIP - ; channel. Two implementation are currenlty available - "fixed" + ; channel. Two implementations are currenlty available - "fixed" ; (with size always equals to jbmaxsize) and "adaptive" (with ; variable size, actually the new jb of IAX2). Defaults to fixed. diff --git a/configs/skinny.conf.sample b/configs/skinny.conf.sample index ab368b1ab..e18709334 100644 --- a/configs/skinny.conf.sample +++ b/configs/skinny.conf.sample @@ -29,7 +29,7 @@ keepAlive=120 ; and programs. Defaults to 1000. ;jbimpl = fixed ; Jitterbuffer implementation, used on the receiving side of a - ; skinny channel. Two implementation are currently available + ; skinny channel. Two implementations are currently available ; - "fixed" (with size always equals to jbmaxsize) ; - "adaptive" (with variable size, actually the new jb of IAX2). ; Defaults to fixed. diff --git a/configs/zapata.conf.sample b/configs/zapata.conf.sample index aacbce020..c20ecbe5f 100644 --- a/configs/zapata.conf.sample +++ b/configs/zapata.conf.sample @@ -501,11 +501,7 @@ immediate=no ; 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". + ; be used if the sending side can create jitter. ; jbmaxsize = 200 ; Max length of the jitterbuffer in milliseconds. @@ -514,8 +510,8 @@ immediate=no ; 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" +; jbimpl = fixed ; Jitterbuffer implementation, used on the receiving side of a ZAP + ; channel. Two implementations 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. |