aboutsummaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2011-07-22 16:44:20 +0200
committerPatrick McHardy <kaber@trash.net>2011-07-22 16:44:20 +0200
commit2b9be10b177024bd663bd5fce19ea0fb76260c27 (patch)
treef6c296350683ee94c120213bef57e14fd153b23a /configs
parent916e420bf0c8db7a8cb1f60557cd2807652142cf (diff)
parent28da2a199d7e1624ac56ccb27d3671117f4e2717 (diff)
Merge branch 'master' of 192.168.0.100:/repos/git/asteriskHEADmaster
Diffstat (limited to 'configs')
-rw-r--r--configs/chan_dahdi.conf.sample7
-rw-r--r--configs/chan_ooh323.conf.sample12
-rw-r--r--configs/codecs.conf.sample19
-rw-r--r--configs/confbridge.conf.sample23
-rw-r--r--configs/features.conf.sample4
5 files changed, 62 insertions, 3 deletions
diff --git a/configs/chan_dahdi.conf.sample b/configs/chan_dahdi.conf.sample
index 16269dc..b7f59f7 100644
--- a/configs/chan_dahdi.conf.sample
+++ b/configs/chan_dahdi.conf.sample
@@ -664,6 +664,13 @@ transfer=yes
; ('canpark=no' is overridden by 'transfer=yes')
;
canpark=yes
+
+; Sets the default parking lot for call parking.
+; This is setable per channel.
+; Parkinglots are configured in features.conf
+;
+;parkinglot=plaza
+
;
; Support call forward variable
;
diff --git a/configs/chan_ooh323.conf.sample b/configs/chan_ooh323.conf.sample
index 8dbdafc..20ccf73 100644
--- a/configs/chan_ooh323.conf.sample
+++ b/configs/chan_ooh323.conf.sample
@@ -122,6 +122,18 @@ dtmfmode=rfc2833
;
;roundtrip=x,y
+;
+; FAX detection will cause the OOH323 channel to jump to the 'fax' extension (if it exists)
+; based one or more events being detected. The events that can be detected are an incoming
+; CNG tone or an incoming T.38 RequestMode packet
+;
+; yes - enable both detection (CNG & T.38)
+; no - disable both
+; cng - enable CNG detection (default)
+; t38 - enable T.38 request detection
+;
+faxdetect = cng
+
; User/peer/friend definitions:
; User config options Peer config options
; ------------------ -------------------
diff --git a/configs/codecs.conf.sample b/configs/codecs.conf.sample
index 4404d4a..9b57385 100644
--- a/configs/codecs.conf.sample
+++ b/configs/codecs.conf.sample
@@ -126,7 +126,6 @@ maxbitrate=20000
fec=true
packetloss_percentage=10;
-
[silk24]
type=silk
samprate=24000
@@ -134,3 +133,21 @@ maxbitrate=30000
fec=true
packetloss_percentage=10;
+
+; Default custom CELT codec definitions. Only one custom CELT definition is allowed
+; per a sample rate.
+;[celt44]
+;type=celt
+;samprate=44100 ; The samplerate in hz. This option is required.
+;framesize=480 ; The framesize option represents the duration of each frame in samples.
+ ; This must be a factor of 2. This option is only advertised in an SDP
+ ; when it is set. Otherwise a default of framesize of 480 is assumed
+ ; internally
+
+;[celt48]
+;type=celt
+;samprate=48000
+
+;[celt32]
+;type=celt
+;samprate=32000
diff --git a/configs/confbridge.conf.sample b/configs/confbridge.conf.sample
index 4083870..e60ba73 100644
--- a/configs/confbridge.conf.sample
+++ b/configs/confbridge.conf.sample
@@ -168,9 +168,13 @@ type=bridge
; larger amounts of delay into the bridge. Valid values here are 10, 20, 40,
; or 80. By default 20ms is used.
-;video_mode = follow_talker ; Sets how confbridge handles video distribution to the conference participants.
+;video_mode = follow_talker; Sets how confbridge handles video distribution to the conference participants.
; Note that participants wanting to view and be the source of a video feed
- ; _MUST_ be sharing the same video codec.
+ ; _MUST_ be sharing the same video codec. Also, using video in conjunction with
+ ; with the jitterbuffer currently results in the audio being slightly out of sync
+ ; with the video. This is a result of the jitterbuffer only working on the audio
+ ; stream. It is recommended to disable the jitterbuffer when video is used.
+ ;
; --- MODES ---
; none: No video sources are set by default in the conference. It is still
; possible for a user to be set as a video source via AMI or DTMF action
@@ -284,8 +288,23 @@ type=bridge
; admin_toggle_conference_lock ; This action allows an Admin to toggle locking and
; unlocking the conference. Non admins can not use
; this action even if it is in their menu.
+
; set_as_single_video_src ; This action allows any user to set themselves as the
; single video source distributed to all participants.
+ ; This will make the video feed stick to them regardless
+ ; of what the video_mode is set to.
+
+; release_as_single_video_src ; This action allows a user to release themselves as
+ ; the video source. If video_mode is not set to "none"
+ ; this action will result in the conference returning to
+ ; whatever video mode the bridge profile is using.
+ ;
+ ; Note that this action will have no effect if the user
+ ; is not currently the video source. Also, the user is
+ ; not guaranteed by using this action that they will not
+ ; become the video source again. The bridge will return
+ ; to whatever operation the video_mode option is set to
+ ; upon release of the video src.
[sample_user_menu]
type=menu
diff --git a/configs/features.conf.sample b/configs/features.conf.sample
index f9d9dd4..dfeec17 100644
--- a/configs/features.conf.sample
+++ b/configs/features.conf.sample
@@ -73,6 +73,10 @@ context => parkedcalls ; Which context parked calls are in (default parking lot
; caller is connected, then by default, the system will try to call back the
; person that did the transfer. If this is set to "yes", the callback will
; not be attempted and the transfer will just fail.
+ ; For atxferdropcall=no to work properly, you also need to
+ ; define ATXFER_NULL_TECH in main/features.c. The reason the
+ ; code is not enabled by default is spelled out in the comment
+ ; block near the top of main/features.c describing ATXFER_NULL_TECH.
;atxferloopdelay = 10 ; Number of seconds to sleep between retries (if atxferdropcall = no)
;atxfercallbackretries = 2 ; Number of times to attempt to send the call back to the transferer.
; By default, this is 2.