Skip to content
Snippets Groups Projects
Commit 4e99cc88 authored by Russell Bryant's avatar Russell Bryant
Browse files

Merge the main set of changes from team/russell/chan_console.

Add a new console channel driver, chan_console, which is a console channel
driver that uses portaudio as a cross platform audio interface.  It was written
to provide a console channel driver that works with Mac CoreAudio, but it
supports a number of other audio interfaces, as well, including OSS and ALSA.
It could one day be the single console channel driver, but does not yet have
as many features as chan_oss.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@95412 65c4cc65-6c06-0410-ace0-fbb531ad65f3
parent 91ac3e9d
Branches
Tags
No related merge requests found
...@@ -58,6 +58,8 @@ Dialplan functions ...@@ -58,6 +58,8 @@ Dialplan functions
* Added EXTENSION_STATE() dialplan function which allows retrieving the state * Added EXTENSION_STATE() dialplan function which allows retrieving the state
of any extension. of any extension.
* Added SYSINFO() dialplan function which allows retrieval of system information * Added SYSINFO() dialplan function which allows retrieval of system information
* Added a new dialplan function, DIALPLAN_EXISTS(), which allows you to check for
the existence of a dialplan target.
CLI Changes CLI Changes
----------- -----------
...@@ -136,11 +138,15 @@ MGCP changes ...@@ -136,11 +138,15 @@ MGCP changes
------------ ------------
* Added separate settings for media QoS in mgcp.conf * Added separate settings for media QoS in mgcp.conf
OSS Channel changes Console Channel Driver changes
------------------- -------------------
* Added experimental support for video send&receive. * Added experimental support for video send & receive to chan_oss.
Requires SDL and ffmpeg/avcodec, plus Video4Linux or X11 This requires SDL and ffmpeg/avcodec, plus Video4Linux or X11 to act as
to act as video source. a video source.
* Added a new channel driver, chan_console, which uses portaudio as a cross
platform audio interface. It was written as a channel driver that would
work with Mac CoreAudio, but portaudio supports a number of other audio
interfaces, as well.
Phone channel changes (chan_phone) Phone channel changes (chan_phone)
---------------------------------- ----------------------------------
...@@ -175,8 +181,8 @@ Zaptel channel driver (chan_zap) Changes ...@@ -175,8 +181,8 @@ Zaptel channel driver (chan_zap) Changes
* Added two new options: mwimonitor and mwimonitornotify. These options allow * Added two new options: mwimonitor and mwimonitornotify. These options allow
you to enable MWI monitoring on FXO lines. When the MWI state changes, you to enable MWI monitoring on FXO lines. When the MWI state changes,
the script specified in the mwimonitornotify option is executed. An internal the script specified in the mwimonitornotify option is executed. An internal
event indicating the new state of the mailbox is also generated, so that event indicating the new state of the mailbox is also generated, so that
the normal MWI facilities in Asterisk work as usual. the normal MWI facilities in Asterisk work as usual.
A new channel driver: Unistim A new channel driver: Unistim
----------------------------- -----------------------------
...@@ -324,7 +330,7 @@ Music On Hold Changes ...@@ -324,7 +330,7 @@ Music On Hold Changes
* Support for realtime music on hold has been added. * Support for realtime music on hold has been added.
* In conjunction with the realtime music on hold, a general section has * In conjunction with the realtime music on hold, a general section has
been added to musiconhold.conf, its sole variable is cachertclasses. If this been added to musiconhold.conf, its sole variable is cachertclasses. If this
is set, then music on hold classes found in realtime will be cached in memory. is set, then music on hold classes found in realtime will be cached in memory.
AEL Changes AEL Changes
----------- -----------
...@@ -423,5 +429,3 @@ Miscellaneous ...@@ -423,5 +429,3 @@ Miscellaneous
* A new option when starting a remote asterisk (rasterisk, asterisk -r) for * A new option when starting a remote asterisk (rasterisk, asterisk -r) for
specifying which socket to use to connect to the running Asterisk daemon specifying which socket to use to connect to the running Asterisk daemon
(-s) (-s)
* Added a new dialplan function, DIALPLAN_EXISTS(), which allows you to check for
the existence of a dialplan target.
This diff is collapsed.
;
; Configuration for chan_console, a cross-platform console channel driver.
;
[general]
; Set this option to "yes" to enable automatically answering calls on the
; console. This is very useful if the console is used as an intercom.
; The default value is "no".
;
;autoanswer = no
; Set the default context to use for outgoing calls. This can be overridden by
; dialing some extension@context, unless the overridecontext option is enabled.
; The default is "default".
;
;context = default
; Set the default extension to use for outgoing calls. The default is "s".
;
;extension = s
; Set the default CallerID for created channels.
;
;callerid = MyName Here <(256) 428-6000>
; Set the default language for created channels.
;
;language = en
; If you set overridecontext to 'yes', then the whole dial string
; will be interpreted as an extension, which is extremely useful
; to dial SIP, IAX and other extensions which use the '@' character.
; The default is "no".
;
;overridecontext = no ; if 'no', the last @ will start the context
; if 'yes' the whole string is an extension.
; Default Music on Hold class to use when this channel is placed on hold in
; the case that the music class is not set on the channel with
; Set(CHANNEL(musicclass)=whatever) in the dialplan and the peer channel
; putting this one on hold did not suggest a class to use.
;
;mohinterpret=default
;------------------------------ JITTER BUFFER CONFIGURATION --------------------------
; jbenable = yes ; Enables the use of a jitterbuffer on the receiving side of an
; Console 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 Console channel can't accept jitter,
; thus an enabled jitterbuffer on the receive Console side will always
; be used if the sending side can create jitter.
; 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, usually sent from exotic devices
; and programs. Defaults to 1000.
; jbimpl = fixed ; Jitterbuffer implementation, used on the receiving side of a Console
; channel. Two implementations are currently 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".
;-----------------------------------------------------------------------------------
...@@ -31,8 +31,9 @@ noload => pbx_kdeconsole.so ...@@ -31,8 +31,9 @@ noload => pbx_kdeconsole.so
; ;
load => res_musiconhold.so load => res_musiconhold.so
; ;
; Load either OSS or ALSA, not both ; Load one of: chan_oss, alsa, or console (portaudio).
; By default, load OSS only (automatically) and do not load ALSA ; By default, load chan_oss only (automatically).
; ;
noload => chan_alsa.so noload => chan_alsa.so
;noload => chan_oss.so ;noload => chan_oss.so
;noload => chan_console.so
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment