[asterisk-commits] rmudgett: trunk r374730 - in /trunk: ./ configs/chan_dahdi.conf.sample

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Mon Oct  8 17:31:09 2012
New Revision: 374730

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=374730
Log:
dahdi.conf.sample: Add description for "buffers" setting.

This contains an edited version of the patch originally uploaded by John
Bigelow.

(closes issue ASTERISK-14435)
Reported by: John Bigelow
Patches:
      buffers.patch (license #5091) patch uploaded by John Bigelow
      0001-dahdi.conf.sample-Add-description-for-buffers-settin.patch (license #5417) patch uploaded by Shaun Ruffell
      Modified
........

Merged revisions 374727 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 374728 from http://svn.asterisk.org/svn/asterisk/branches/10
........

Merged revisions 374729 from http://svn.asterisk.org/svn/asterisk/branches/11

Modified:
    trunk/   (props changed)
    trunk/configs/chan_dahdi.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-11-merged' - no diff available.

Modified: trunk/configs/chan_dahdi.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/chan_dahdi.conf.sample?view=diff&rev=374730&r1=374729&r2=374730
==============================================================================
--- trunk/configs/chan_dahdi.conf.sample (original)
+++ trunk/configs/chan_dahdi.conf.sample Mon Oct  8 17:31:09 2012
@@ -1051,6 +1051,33 @@
 ;
 ;faxbuffers=>6,full
 ;
+; Configure the default number of DAHDI buffers and the transmit policy to use.
+; This can be used to eliminate data drops when scheduling jitter prevents
+; Asterisk from writing to a DAHDI channel regularly. Most users will probably
+; want "faxbuffers" instead of "buffers".
+;
+; The policies are:
+; immediate - DAHDI will immediately start sending the data to the hardware after
+;             Asterisk writes to the channel. This is the default mode. It
+;             introduces the least amount of latency but has an increased chance for
+;             hardware under runs if Asterisk is not able to keep the DAHDI write
+;             queue from going empty.
+; half      - DAHDI will wait until half of the configured buffers are full before
+;             starting to transmit. This adds latency to the audio but reduces
+;             the chance of under runs. Essentially, this is like an in-kernel jitter
+;             buffer.
+; full      - DAHDI will not start transmitting until all buffers are full.
+;             Introduces the most amount of latency and is susceptible to over
+;             runs from the Asterisk process.
+;
+; The receive policy is never changed. DAHDI will always pass up audio as soon
+; as possible.
+;
+; The default number of buffers is 4 (from jitterbuffers) and the default policy
+; is immediate.
+;
+;buffers=4,immediate
+;
 ; This option specifies what to do when the channel's bridged peer puts the
 ; ISDN channel on hold.  Settable per logical ISDN span.
 ; moh:          Generate music-on-hold to the remote party.