2002-02-19 20:14:14 +00:00
|
|
|
/*
|
2005-09-14 20:46:50 +00:00
|
|
|
* Asterisk -- An open source telephony toolkit.
|
2002-02-19 20:14:14 +00:00
|
|
|
*
|
2005-09-14 20:46:50 +00:00
|
|
|
* Copyright (C) 1999 - 2005, Digium, Inc.
|
2002-02-19 20:14:14 +00:00
|
|
|
*
|
2004-12-19 21:13:41 +00:00
|
|
|
* By Matthew Fredrickson <creslin@digium.com>
|
2002-02-19 20:14:14 +00:00
|
|
|
*
|
2005-09-14 20:46:50 +00:00
|
|
|
* See http://www.asterisk.org for more information about
|
|
|
|
* the Asterisk project. Please do not directly contact
|
|
|
|
* any of the maintainers of this project for assistance;
|
|
|
|
* the project provides a web site, mailing lists and IRC
|
|
|
|
* channels for your use.
|
|
|
|
*
|
2002-02-19 20:14:14 +00:00
|
|
|
* This program is free software, distributed under the terms of
|
2005-09-14 20:46:50 +00:00
|
|
|
* the GNU General Public License Version 2. See the LICENSE file
|
|
|
|
* at the top of the source tree.
|
2002-02-19 20:14:14 +00:00
|
|
|
*/
|
|
|
|
|
2005-10-24 20:12:06 +00:00
|
|
|
/*! \file
|
|
|
|
* \brief ALSA sound card channel driver
|
2005-11-06 15:09:47 +00:00
|
|
|
*
|
2005-12-30 21:18:06 +00:00
|
|
|
* \author Matthew Fredrickson <creslin@digium.com>
|
|
|
|
*
|
2005-11-06 15:09:47 +00:00
|
|
|
* \ingroup channel_drivers
|
2005-10-24 20:12:06 +00:00
|
|
|
*/
|
|
|
|
|
2012-10-14 21:47:40 +00:00
|
|
|
/*! \li \ref chan_alsa.c uses the configuration file \ref alsa.conf
|
2012-10-01 23:24:35 +00:00
|
|
|
* \addtogroup configuration_file
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*! \page alsa.conf alsa.conf
|
|
|
|
* \verbinclude alsa.conf.sample
|
|
|
|
*/
|
|
|
|
|
2006-04-24 17:11:45 +00:00
|
|
|
/*** MODULEINFO
|
2008-11-04 15:07:54 +00:00
|
|
|
<depend>alsa</depend>
|
2011-07-14 20:28:54 +00:00
|
|
|
<support_level>extended</support_level>
|
2006-04-24 17:11:45 +00:00
|
|
|
***/
|
2005-09-14 20:46:50 +00:00
|
|
|
|
2006-06-07 18:54:56 +00:00
|
|
|
#include "asterisk.h"
|
|
|
|
|
2002-02-19 20:14:14 +00:00
|
|
|
#include <fcntl.h>
|
|
|
|
#include <sys/ioctl.h>
|
|
|
|
#include <sys/time.h>
|
2004-03-24 21:34:21 +00:00
|
|
|
|
|
|
|
#define ALSA_PCM_NEW_HW_PARAMS_API
|
|
|
|
#define ALSA_PCM_NEW_SW_PARAMS_API
|
2002-02-19 20:14:14 +00:00
|
|
|
#include <alsa/asoundlib.h>
|
2004-03-24 21:34:21 +00:00
|
|
|
|
2005-06-06 21:09:59 +00:00
|
|
|
#include "asterisk/frame.h"
|
|
|
|
#include "asterisk/channel.h"
|
|
|
|
#include "asterisk/module.h"
|
|
|
|
#include "asterisk/pbx.h"
|
|
|
|
#include "asterisk/config.h"
|
|
|
|
#include "asterisk/cli.h"
|
|
|
|
#include "asterisk/utils.h"
|
|
|
|
#include "asterisk/causes.h"
|
|
|
|
#include "asterisk/endian.h"
|
2006-02-01 23:05:28 +00:00
|
|
|
#include "asterisk/stringfields.h"
|
2006-05-31 17:29:12 +00:00
|
|
|
#include "asterisk/abstract_jb.h"
|
2006-07-19 20:44:39 +00:00
|
|
|
#include "asterisk/musiconhold.h"
|
Merged revisions 182810 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r182810 | russell | 2009-03-17 21:09:13 -0500 (Tue, 17 Mar 2009) | 44 lines
Fix cases where the internal poll() was not being used when it needed to be.
We have seen a number of problems caused by poll() not working properly on
Mac OSX. If you search around, you'll find a number of references to using
select() instead of poll() to work around these issues. In Asterisk, we've
had poll.c which implements poll() using select() internally. However, we
were still getting reports of problems.
vadim investigated a bit and realized that at least on his system, even
though we were compiling in poll.o, the system poll() was still being used.
So, the primary purpose of this patch is to ensure that we're using the
internal poll() when we want it to be used.
The changes are:
1) Remove logic for when internal poll should be used from the Makefile.
Instead, put it in the configure script. The logic in the configure
script is the same as it was in the Makefile. Ideally, we would have
a functionality test for the problem, but that's not actually possible,
since we would have to be able to run an application on the _target_
system to test poll() behavior.
2) Always include poll.o in the build, but it will be empty if AST_POLL_COMPAT
is not defined.
3) Change uses of poll() throughout the source tree to ast_poll(). I feel
that it is good practice to give the API call a new name when we are
changing its behavior and not using the system version directly in all cases.
So, normally, ast_poll() is just redefined to poll(). On systems where
AST_POLL_COMPAT is defined, ast_poll() is redefined to ast_internal_poll().
4) Change poll() in main/poll.c to be ast_internal_poll().
It's worth noting that any code that still uses poll() directly will work fine
(if they worked fine before). So, for example, out of tree modules that are
using poll() will not stop working or anything. However, for modules to work
properly on Mac OSX, ast_poll() needs to be used.
(closes issue #13404)
Reported by: agalbraith
Tested by: russell, vadim
http://reviewboard.digium.com/r/198/
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@182847 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-03-18 02:28:55 +00:00
|
|
|
#include "asterisk/poll-compat.h"
|
2013-10-02 16:23:34 +00:00
|
|
|
#include "asterisk/stasis_channels.h"
|
media formats: re-architect handling of media for performance improvements
In the old times media formats were represented using a bit field. This was
fast but had a few limitations.
1. Asterisk was limited in how many formats it could handle.
2. Formats, being a bit field, could not include any attribute information.
A format was strictly its type, e.g., "this is ulaw".
This was changed in Asterisk 10 (see
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal for
notes on that work) which led to the creation of the ast_format structure.
This structure allowed Asterisk to handle attributes and bundle information
with a format.
Additionally, ast_format_cap was created to act as a container for multiple
formats that, together, formed the capability of some entity. Another
mechanism was added to allow logic to be registered which performed format
attribute negotiation. Everywhere throughout the codebase Asterisk was
changed to use this strategy.
Unfortunately, in software, there is no free lunch. These new capabilities
came at a cost.
Performance analysis and profiling showed that we spend an inordinate
amount of time comparing, copying, and generally manipulating formats and
their related structures. Basic prototyping has shown that a reasonably
large performance improvement could be made in this area. This patch is the
result of that project, which overhauled the media format architecture
and its usage in Asterisk to improve performance.
Generally, the new philosophy for handling formats is as follows:
* The ast_format structure is reference counted. This removed a large amount
of the memory allocations and copying that was done in prior versions.
* In order to prevent race conditions while keeping things performant, the
ast_format structure is immutable by convention and lock-free. Violate this
tenet at your peril!
* Because formats are reference counted, codecs are also reference counted.
The Asterisk core generally provides built-in codecs and caches the
ast_format structures created to represent them. Generally, to prevent
inordinate amounts of module reference bumping, codecs and formats can be
added at run-time but cannot be removed.
* All compatibility with the bit field representation of codecs/formats has
been moved to a compatibility API. The primary user of this representation
is chan_iax2, which must continue to maintain its bit-field usage of formats
for interoperability concerns.
* When a format is negotiated with attributes, or when a format cannot be
represented by one of the cached formats, a new format object is created or
cloned from an existing format. That format may have the same codec
underlying it, but is a different format than a version of the format with
different attributes or without attributes.
* While formats are reference counted objects, the reference count maintained
on the format should be manipulated with care. Formats are generally cached
and will persist for the lifetime of Asterisk and do not explicitly need
to have their lifetime modified. An exception to this is when the user of a
format does not know where the format came from *and* the user may outlive
the provider of the format. This occurs, for example, when a format is read
from a channel: the channel may have a format with attributes (hence,
non-cached) and the user of the format may last longer than the channel (if
the reference to the channel is released prior to the format's reference).
For more information on this work, see the API design notes:
https://wiki.asterisk.org/wiki/display/AST/Media+Format+Rewrite
Finally, this work was the culmination of a large number of developer's
efforts. Extra thanks goes to Corey Farrell, who took on a large amount of the
work in the Asterisk core, chan_sip, and was an invaluable resource in peer
reviews throughout this project.
There were a substantial number of patches contributed during this work; the
following issues/patch names simply reflect some of the work (and will cause
the release scripts to give attribution to the individuals who work on them).
Reviews:
https://reviewboard.asterisk.org/r/3814
https://reviewboard.asterisk.org/r/3808
https://reviewboard.asterisk.org/r/3805
https://reviewboard.asterisk.org/r/3803
https://reviewboard.asterisk.org/r/3801
https://reviewboard.asterisk.org/r/3798
https://reviewboard.asterisk.org/r/3800
https://reviewboard.asterisk.org/r/3794
https://reviewboard.asterisk.org/r/3793
https://reviewboard.asterisk.org/r/3792
https://reviewboard.asterisk.org/r/3791
https://reviewboard.asterisk.org/r/3790
https://reviewboard.asterisk.org/r/3789
https://reviewboard.asterisk.org/r/3788
https://reviewboard.asterisk.org/r/3787
https://reviewboard.asterisk.org/r/3786
https://reviewboard.asterisk.org/r/3784
https://reviewboard.asterisk.org/r/3783
https://reviewboard.asterisk.org/r/3778
https://reviewboard.asterisk.org/r/3774
https://reviewboard.asterisk.org/r/3775
https://reviewboard.asterisk.org/r/3772
https://reviewboard.asterisk.org/r/3761
https://reviewboard.asterisk.org/r/3754
https://reviewboard.asterisk.org/r/3753
https://reviewboard.asterisk.org/r/3751
https://reviewboard.asterisk.org/r/3750
https://reviewboard.asterisk.org/r/3748
https://reviewboard.asterisk.org/r/3747
https://reviewboard.asterisk.org/r/3746
https://reviewboard.asterisk.org/r/3742
https://reviewboard.asterisk.org/r/3740
https://reviewboard.asterisk.org/r/3739
https://reviewboard.asterisk.org/r/3738
https://reviewboard.asterisk.org/r/3737
https://reviewboard.asterisk.org/r/3736
https://reviewboard.asterisk.org/r/3734
https://reviewboard.asterisk.org/r/3722
https://reviewboard.asterisk.org/r/3713
https://reviewboard.asterisk.org/r/3703
https://reviewboard.asterisk.org/r/3689
https://reviewboard.asterisk.org/r/3687
https://reviewboard.asterisk.org/r/3674
https://reviewboard.asterisk.org/r/3671
https://reviewboard.asterisk.org/r/3667
https://reviewboard.asterisk.org/r/3665
https://reviewboard.asterisk.org/r/3625
https://reviewboard.asterisk.org/r/3602
https://reviewboard.asterisk.org/r/3519
https://reviewboard.asterisk.org/r/3518
https://reviewboard.asterisk.org/r/3516
https://reviewboard.asterisk.org/r/3515
https://reviewboard.asterisk.org/r/3512
https://reviewboard.asterisk.org/r/3506
https://reviewboard.asterisk.org/r/3413
https://reviewboard.asterisk.org/r/3410
https://reviewboard.asterisk.org/r/3387
https://reviewboard.asterisk.org/r/3388
https://reviewboard.asterisk.org/r/3389
https://reviewboard.asterisk.org/r/3390
https://reviewboard.asterisk.org/r/3321
https://reviewboard.asterisk.org/r/3320
https://reviewboard.asterisk.org/r/3319
https://reviewboard.asterisk.org/r/3318
https://reviewboard.asterisk.org/r/3266
https://reviewboard.asterisk.org/r/3265
https://reviewboard.asterisk.org/r/3234
https://reviewboard.asterisk.org/r/3178
ASTERISK-23114 #close
Reported by: mjordan
media_formats_translation_core.diff uploaded by kharwell (License 6464)
rb3506.diff uploaded by mjordan (License 6283)
media_format_app_file.diff uploaded by kharwell (License 6464)
misc-2.diff uploaded by file (License 5000)
chan_mild-3.diff uploaded by file (License 5000)
chan_obscure.diff uploaded by file (License 5000)
jingle.diff uploaded by file (License 5000)
funcs.diff uploaded by file (License 5000)
formats.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
bridges.diff uploaded by file (License 5000)
mf-codecs-2.diff uploaded by file (License 5000)
mf-app_fax.diff uploaded by file (License 5000)
mf-apps-3.diff uploaded by file (License 5000)
media-formats-3.diff uploaded by file (License 5000)
ASTERISK-23715
rb3713.patch uploaded by coreyfarrell (License 5909)
rb3689.patch uploaded by mjordan (License 6283)
ASTERISK-23957
rb3722.patch uploaded by mjordan (License 6283)
mf-attributes-3.diff uploaded by file (License 5000)
ASTERISK-23958
Tested by: jrose
rb3822.patch uploaded by coreyfarrell (License 5909)
rb3800.patch uploaded by jrose (License 6182)
chan_sip.diff uploaded by mjordan (License 6283)
rb3747.patch uploaded by jrose (License 6182)
ASTERISK-23959 #close
Tested by: sgriepentrog, mjordan, coreyfarrell
sip_cleanup.diff uploaded by opticron (License 6273)
chan_sip_caps.diff uploaded by mjordan (License 6283)
rb3751.patch uploaded by coreyfarrell (License 5909)
chan_sip-3.diff uploaded by file (License 5000)
ASTERISK-23960 #close
Tested by: opticron
direct_media.diff uploaded by opticron (License 6273)
pjsip-direct-media.diff uploaded by file (License 5000)
format_cap_remove.diff uploaded by opticron (License 6273)
media_format_fixes.diff uploaded by opticron (License 6273)
chan_pjsip-2.diff uploaded by file (License 5000)
ASTERISK-23966 #close
Tested by: rmudgett
rb3803.patch uploaded by rmudgetti (License 5621)
chan_dahdi.diff uploaded by file (License 5000)
ASTERISK-24064 #close
Tested by: coreyfarrell, mjordan, opticron, file, rmudgett, sgriepentrog, jrose
rb3814.patch uploaded by rmudgett (License 5621)
moh_cleanup.diff uploaded by opticron (License 6273)
bridge_leak.diff uploaded by opticron (License 6273)
translate.diff uploaded by file (License 5000)
rb3795.patch uploaded by rmudgett (License 5621)
tls_fix.diff uploaded by mjordan (License 6283)
fax-mf-fix-2.diff uploaded by file (License 5000)
rtp_transfer_stuff uploaded by mjordan (License 6283)
rb3787.patch uploaded by rmudgett (License 5621)
media-formats-explicit-translate-format-3.diff uploaded by file (License 5000)
format_cache_case_fix.diff uploaded by opticron (License 6273)
rb3774.patch uploaded by rmudgett (License 5621)
rb3775.patch uploaded by rmudgett (License 5621)
rtp_engine_fix.diff uploaded by opticron (License 6273)
rtp_crash_fix.diff uploaded by opticron (License 6273)
rb3753.patch uploaded by mjordan (License 6283)
rb3750.patch uploaded by mjordan (License 6283)
rb3748.patch uploaded by rmudgett (License 5621)
media_format_fixes.diff uploaded by opticron (License 6273)
rb3740.patch uploaded by mjordan (License 6283)
rb3739.patch uploaded by mjordan (License 6283)
rb3734.patch uploaded by mjordan (License 6283)
rb3689.patch uploaded by mjordan (License 6283)
rb3674.patch uploaded by coreyfarrell (License 5909)
rb3671.patch uploaded by coreyfarrell (License 5909)
rb3667.patch uploaded by coreyfarrell (License 5909)
rb3665.patch uploaded by mjordan (License 6283)
rb3625.patch uploaded by coreyfarrell (License 5909)
rb3602.patch uploaded by coreyfarrell (License 5909)
format_compatibility-2.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-07-20 22:06:33 +00:00
|
|
|
#include "asterisk/format_cache.h"
|
2005-06-06 21:09:59 +00:00
|
|
|
|
2011-05-05 22:55:09 +00:00
|
|
|
/*! Global jitterbuffer configuration - by default, jb is disabled
|
|
|
|
* \note Values shown here match the defaults shown in alsa.conf.sample */
|
2006-09-08 03:46:33 +00:00
|
|
|
static struct ast_jb_conf default_jbconf = {
|
2006-05-31 16:56:50 +00:00
|
|
|
.flags = 0,
|
2011-05-05 22:55:09 +00:00
|
|
|
.max_size = 200,
|
|
|
|
.resync_threshold = 1000,
|
|
|
|
.impl = "fixed",
|
|
|
|
.target_extra = 40,
|
2006-05-31 16:56:50 +00:00
|
|
|
};
|
|
|
|
static struct ast_jb_conf global_jbconf;
|
|
|
|
|
2002-02-19 20:14:14 +00:00
|
|
|
#define DEBUG 0
|
|
|
|
/* Which device to use */
|
2007-02-26 20:43:18 +00:00
|
|
|
#define ALSA_INDEV "default"
|
|
|
|
#define ALSA_OUTDEV "default"
|
2002-02-19 20:14:14 +00:00
|
|
|
#define DESIRED_RATE 8000
|
|
|
|
|
|
|
|
/* Lets use 160 sample frames, just like GSM. */
|
2004-04-11 01:59:11 +00:00
|
|
|
#define FRAME_SIZE 160
|
2006-09-08 03:46:33 +00:00
|
|
|
#define PERIOD_FRAMES 80 /* 80 Frames, at 2 bytes each */
|
2004-04-11 01:59:11 +00:00
|
|
|
|
|
|
|
/* When you set the frame size, you have to come up with
|
|
|
|
the right buffer format as well. */
|
|
|
|
/* 5 64-byte frames = one frame */
|
|
|
|
#define BUFFER_FMT ((buffersize * 10) << 16) | (0x0006);
|
|
|
|
|
|
|
|
/* Don't switch between read/write modes faster than every 300 ms */
|
|
|
|
#define MIN_SWITCH_TIME 600
|
2002-02-19 20:14:14 +00:00
|
|
|
|
2005-03-24 00:55:40 +00:00
|
|
|
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
2002-02-19 20:14:14 +00:00
|
|
|
static snd_pcm_format_t format = SND_PCM_FORMAT_S16_LE;
|
2005-03-24 00:55:40 +00:00
|
|
|
#else
|
|
|
|
static snd_pcm_format_t format = SND_PCM_FORMAT_S16_BE;
|
|
|
|
#endif
|
|
|
|
|
2002-02-19 20:14:14 +00:00
|
|
|
static char indevname[50] = ALSA_INDEV;
|
|
|
|
static char outdevname[50] = ALSA_OUTDEV;
|
|
|
|
|
2004-04-11 01:59:11 +00:00
|
|
|
static int silencesuppression = 0;
|
|
|
|
static int silencethreshold = 1000;
|
|
|
|
|
2004-06-26 03:50:14 +00:00
|
|
|
AST_MUTEX_DEFINE_STATIC(alsalock);
|
2002-02-19 20:14:14 +00:00
|
|
|
|
2005-03-04 06:47:24 +00:00
|
|
|
static const char tdesc[] = "ALSA Console Channel Driver";
|
|
|
|
static const char config[] = "alsa.conf";
|
2002-02-19 20:14:14 +00:00
|
|
|
|
2005-07-10 23:49:57 +00:00
|
|
|
static char context[AST_MAX_CONTEXT] = "default";
|
2002-02-19 20:14:14 +00:00
|
|
|
static char language[MAX_LANGUAGE] = "";
|
|
|
|
static char exten[AST_MAX_EXTENSION] = "s";
|
2006-07-19 20:44:39 +00:00
|
|
|
static char mohinterpret[MAX_MUSICCLASS];
|
2002-02-19 20:14:14 +00:00
|
|
|
|
2006-09-08 03:46:33 +00:00
|
|
|
static int hookstate = 0;
|
2002-02-19 20:14:14 +00:00
|
|
|
|
2004-04-11 01:59:11 +00:00
|
|
|
static struct chan_alsa_pvt {
|
2002-02-19 20:14:14 +00:00
|
|
|
/* We only have one ALSA structure -- near sighted perhaps, but it
|
|
|
|
keeps this driver as simple as possible -- as it should be. */
|
|
|
|
struct ast_channel *owner;
|
|
|
|
char exten[AST_MAX_EXTENSION];
|
2005-07-10 23:49:57 +00:00
|
|
|
char context[AST_MAX_CONTEXT];
|
2004-04-11 01:59:11 +00:00
|
|
|
snd_pcm_t *icard, *ocard;
|
2006-09-08 03:46:33 +00:00
|
|
|
|
2004-04-11 01:59:11 +00:00
|
|
|
} alsa;
|
|
|
|
|
|
|
|
/* Number of buffers... Each is FRAMESIZE/8 ms long. For example
|
|
|
|
with 160 sample frames, and a buffer size of 3, we have a 60ms buffer,
|
|
|
|
usually plenty. */
|
2002-02-19 20:14:14 +00:00
|
|
|
|
|
|
|
#define MAX_BUFFER_SIZE 100
|
2004-04-11 01:59:11 +00:00
|
|
|
|
|
|
|
/* File descriptors for sound device */
|
|
|
|
static int readdev = -1;
|
|
|
|
static int writedev = -1;
|
2002-02-19 20:14:14 +00:00
|
|
|
|
|
|
|
static int autoanswer = 1;
|
2009-11-12 23:37:36 +00:00
|
|
|
static int mute = 0;
|
|
|
|
static int noaudiocapture = 0;
|
2004-01-28 21:06:03 +00:00
|
|
|
|
uniqueid: channel linkedid, ami, ari object creation with id's
Much needed was a way to assign id to objects on creation, and
much change was necessary to accomplish it. Channel uniqueids
and linkedids are split into separate string and creation time
components without breaking linkedid propgation. This allowed
the uniqueid to be specified by the user interface - and those
values are now carried through to channel creation, adding the
assignedids value to every function in the chain including the
channel drivers. For local channels, the second channel can be
specified or left to default to a ;2 suffix of first. In ARI,
bridge, playback, and snoop objects can also be created with a
specified uniqueid.
Along the way, the args order to allocating channels was fixed
in chan_mgcp and chan_gtalk, and linkedid is no longer lost as
masquerade occurs.
(closes issue ASTERISK-23120)
Review: https://reviewboard.asterisk.org/r/3191/
........
Merged revisions 410157 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-03-07 15:47:55 +00:00
|
|
|
static struct ast_channel *alsa_request(const char *type, struct ast_format_cap *cap, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, const char *data, int *cause);
|
Merged revisions 51311 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51311 | russell | 2007-01-19 11:49:38 -0600 (Fri, 19 Jan 2007) | 23 lines
Merge the changes from the /team/group/vldtmf_fixup branch.
The main bug being addressed here is a problem introduced when two SIP
channels using SIP INFO dtmf have their media directly bridged. So, when a
DTMF END frame comes into Asterisk from an incoming INFO message, Asterisk
would try to emulate a digit of some length by first sending a DTMF BEGIN
frame and sending a DTMF END later timed off of incoming audio. However,
since there was no audio coming in, the DTMF_END was never generated. This
caused DTMF based features to no longer work.
To fix this, the core now knows when a channel doesn't care about DTMF BEGIN
frames (such as a SIP channel sending INFO dtmf). If this is the case, then
Asterisk will not emulate a digit of some length, and will instead just pass
through the single DTMF END event.
Channel drivers also now get passed the length of the digit to their digit_end
callback. This improves SIP INFO support even further by enabling us to put
the real digit duration in the INFO message instead of a hard coded 250ms.
Also, for an incoming INFO message, the duration is read from the frame and
passed into the core instead of just getting ignored.
(issue #8597, maybe others...)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-19 18:06:03 +00:00
|
|
|
static int alsa_digit(struct ast_channel *c, char digit, unsigned int duration);
|
2005-03-29 06:16:49 +00:00
|
|
|
static int alsa_text(struct ast_channel *c, const char *text);
|
2005-03-04 06:47:24 +00:00
|
|
|
static int alsa_hangup(struct ast_channel *c);
|
|
|
|
static int alsa_answer(struct ast_channel *c);
|
|
|
|
static struct ast_frame *alsa_read(struct ast_channel *chan);
|
2012-02-01 19:53:38 +00:00
|
|
|
static int alsa_call(struct ast_channel *c, const char *dest, int timeout);
|
2005-03-04 06:47:24 +00:00
|
|
|
static int alsa_write(struct ast_channel *chan, struct ast_frame *f);
|
2006-05-10 12:24:11 +00:00
|
|
|
static int alsa_indicate(struct ast_channel *chan, int cond, const void *data, size_t datalen);
|
2005-03-04 06:47:24 +00:00
|
|
|
static int alsa_fixup(struct ast_channel *oldchan, struct ast_channel *newchan);
|
|
|
|
|
2011-02-03 16:22:10 +00:00
|
|
|
static struct ast_channel_tech alsa_tech = {
|
2006-02-01 23:05:28 +00:00
|
|
|
.type = "Console",
|
2005-03-04 06:47:24 +00:00
|
|
|
.description = tdesc,
|
|
|
|
.requester = alsa_request,
|
2006-08-31 01:59:02 +00:00
|
|
|
.send_digit_end = alsa_digit,
|
2005-03-04 06:47:24 +00:00
|
|
|
.send_text = alsa_text,
|
|
|
|
.hangup = alsa_hangup,
|
|
|
|
.answer = alsa_answer,
|
|
|
|
.read = alsa_read,
|
|
|
|
.call = alsa_call,
|
|
|
|
.write = alsa_write,
|
|
|
|
.indicate = alsa_indicate,
|
|
|
|
.fixup = alsa_fixup,
|
|
|
|
};
|
|
|
|
|
2004-04-11 01:59:11 +00:00
|
|
|
static snd_pcm_t *alsa_card_init(char *dev, snd_pcm_stream_t stream)
|
2002-02-19 20:14:14 +00:00
|
|
|
{
|
|
|
|
int err;
|
2004-03-24 21:34:21 +00:00
|
|
|
int direction;
|
2002-02-19 20:14:14 +00:00
|
|
|
snd_pcm_t *handle = NULL;
|
|
|
|
snd_pcm_hw_params_t *hwparams = NULL;
|
|
|
|
snd_pcm_sw_params_t *swparams = NULL;
|
2004-04-11 01:59:11 +00:00
|
|
|
struct pollfd pfd;
|
|
|
|
snd_pcm_uframes_t period_size = PERIOD_FRAMES * 4;
|
2004-03-24 21:34:21 +00:00
|
|
|
snd_pcm_uframes_t buffer_size = 0;
|
2002-02-19 20:14:14 +00:00
|
|
|
unsigned int rate = DESIRED_RATE;
|
|
|
|
snd_pcm_uframes_t start_threshold, stop_threshold;
|
|
|
|
|
2008-05-13 20:29:27 +00:00
|
|
|
err = snd_pcm_open(&handle, dev, stream, SND_PCM_NONBLOCK);
|
2002-02-19 20:14:14 +00:00
|
|
|
if (err < 0) {
|
|
|
|
ast_log(LOG_ERROR, "snd_pcm_open failed: %s\n", snd_strerror(err));
|
|
|
|
return NULL;
|
2006-10-03 15:53:07 +00:00
|
|
|
} else {
|
2007-06-14 19:39:12 +00:00
|
|
|
ast_debug(1, "Opening device %s in %s mode\n", dev, (stream == SND_PCM_STREAM_CAPTURE) ? "read" : "write");
|
2006-10-03 15:53:07 +00:00
|
|
|
}
|
2002-02-19 20:14:14 +00:00
|
|
|
|
2012-07-31 20:21:43 +00:00
|
|
|
hwparams = ast_alloca(snd_pcm_hw_params_sizeof());
|
2007-09-27 00:08:47 +00:00
|
|
|
memset(hwparams, 0, snd_pcm_hw_params_sizeof());
|
2002-02-19 20:14:14 +00:00
|
|
|
snd_pcm_hw_params_any(handle, hwparams);
|
|
|
|
|
|
|
|
err = snd_pcm_hw_params_set_access(handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED);
|
2006-09-08 03:46:33 +00:00
|
|
|
if (err < 0)
|
2002-02-19 20:14:14 +00:00
|
|
|
ast_log(LOG_ERROR, "set_access failed: %s\n", snd_strerror(err));
|
|
|
|
|
|
|
|
err = snd_pcm_hw_params_set_format(handle, hwparams, format);
|
2006-09-08 03:46:33 +00:00
|
|
|
if (err < 0)
|
2002-02-19 20:14:14 +00:00
|
|
|
ast_log(LOG_ERROR, "set_format failed: %s\n", snd_strerror(err));
|
|
|
|
|
|
|
|
err = snd_pcm_hw_params_set_channels(handle, hwparams, 1);
|
2006-09-08 03:46:33 +00:00
|
|
|
if (err < 0)
|
2002-02-19 20:14:14 +00:00
|
|
|
ast_log(LOG_ERROR, "set_channels failed: %s\n", snd_strerror(err));
|
|
|
|
|
2004-03-24 21:34:21 +00:00
|
|
|
direction = 0;
|
|
|
|
err = snd_pcm_hw_params_set_rate_near(handle, hwparams, &rate, &direction);
|
2006-09-08 03:46:33 +00:00
|
|
|
if (rate != DESIRED_RATE)
|
2014-05-09 22:49:26 +00:00
|
|
|
ast_log(LOG_WARNING, "Rate not correct, requested %d, got %u\n", DESIRED_RATE, rate);
|
2002-02-19 20:14:14 +00:00
|
|
|
|
2004-03-24 21:34:21 +00:00
|
|
|
direction = 0;
|
|
|
|
err = snd_pcm_hw_params_set_period_size_near(handle, hwparams, &period_size, &direction);
|
2006-09-08 03:46:33 +00:00
|
|
|
if (err < 0)
|
2014-05-09 22:49:26 +00:00
|
|
|
ast_log(LOG_ERROR, "period_size(%lu frames) is bad: %s\n", period_size, snd_strerror(err));
|
2006-10-03 15:53:07 +00:00
|
|
|
else {
|
2007-06-14 19:39:12 +00:00
|
|
|
ast_debug(1, "Period size is %d\n", err);
|
2006-10-03 15:53:07 +00:00
|
|
|
}
|
2002-02-19 20:14:14 +00:00
|
|
|
|
2006-09-08 03:46:33 +00:00
|
|
|
buffer_size = 4096 * 2; /* period_size * 16; */
|
2004-04-11 01:59:11 +00:00
|
|
|
err = snd_pcm_hw_params_set_buffer_size_near(handle, hwparams, &buffer_size);
|
2006-09-08 03:46:33 +00:00
|
|
|
if (err < 0)
|
2014-05-09 22:49:26 +00:00
|
|
|
ast_log(LOG_WARNING, "Problem setting buffer size of %lu: %s\n", buffer_size, snd_strerror(err));
|
2006-10-03 15:53:07 +00:00
|
|
|
else {
|
2007-06-14 19:39:12 +00:00
|
|
|
ast_debug(1, "Buffer size is set to %d frames\n", err);
|
2006-10-03 15:53:07 +00:00
|
|
|
}
|
2002-02-19 20:14:14 +00:00
|
|
|
|
|
|
|
err = snd_pcm_hw_params(handle, hwparams);
|
2006-09-08 03:46:33 +00:00
|
|
|
if (err < 0)
|
2002-02-19 20:14:14 +00:00
|
|
|
ast_log(LOG_ERROR, "Couldn't set the new hw params: %s\n", snd_strerror(err));
|
|
|
|
|
2012-07-31 20:21:43 +00:00
|
|
|
swparams = ast_alloca(snd_pcm_sw_params_sizeof());
|
2007-09-27 00:08:47 +00:00
|
|
|
memset(swparams, 0, snd_pcm_sw_params_sizeof());
|
2002-02-19 20:14:14 +00:00
|
|
|
snd_pcm_sw_params_current(handle, swparams);
|
|
|
|
|
2006-09-08 03:46:33 +00:00
|
|
|
if (stream == SND_PCM_STREAM_PLAYBACK)
|
2004-04-11 01:59:11 +00:00
|
|
|
start_threshold = period_size;
|
2006-09-08 03:46:33 +00:00
|
|
|
else
|
2002-02-19 20:14:14 +00:00
|
|
|
start_threshold = 1;
|
|
|
|
|
|
|
|
err = snd_pcm_sw_params_set_start_threshold(handle, swparams, start_threshold);
|
2006-09-08 03:46:33 +00:00
|
|
|
if (err < 0)
|
2002-02-19 20:14:14 +00:00
|
|
|
ast_log(LOG_ERROR, "start threshold: %s\n", snd_strerror(err));
|
|
|
|
|
2006-09-08 03:46:33 +00:00
|
|
|
if (stream == SND_PCM_STREAM_PLAYBACK)
|
2002-02-19 20:14:14 +00:00
|
|
|
stop_threshold = buffer_size;
|
2006-09-08 03:46:33 +00:00
|
|
|
else
|
2004-04-11 01:59:11 +00:00
|
|
|
stop_threshold = buffer_size;
|
2006-09-08 03:46:33 +00:00
|
|
|
|
2002-02-19 20:14:14 +00:00
|
|
|
err = snd_pcm_sw_params_set_stop_threshold(handle, swparams, stop_threshold);
|
2006-09-08 03:46:33 +00:00
|
|
|
if (err < 0)
|
2002-02-19 20:14:14 +00:00
|
|
|
ast_log(LOG_ERROR, "stop threshold: %s\n", snd_strerror(err));
|
|
|
|
|
|
|
|
err = snd_pcm_sw_params(handle, swparams);
|
2006-09-08 03:46:33 +00:00
|
|
|
if (err < 0)
|
2002-02-19 20:14:14 +00:00
|
|
|
ast_log(LOG_ERROR, "sw_params: %s\n", snd_strerror(err));
|
|
|
|
|
|
|
|
err = snd_pcm_poll_descriptors_count(handle);
|
2006-09-08 03:46:33 +00:00
|
|
|
if (err <= 0)
|
2002-02-19 20:14:14 +00:00
|
|
|
ast_log(LOG_ERROR, "Unable to get a poll descriptors count, error is %s\n", snd_strerror(err));
|
2006-10-03 15:53:07 +00:00
|
|
|
if (err != 1) {
|
2007-06-14 19:39:12 +00:00
|
|
|
ast_debug(1, "Can't handle more than one device\n");
|
2006-10-03 15:53:07 +00:00
|
|
|
}
|
2002-02-19 20:14:14 +00:00
|
|
|
|
2004-04-11 01:59:11 +00:00
|
|
|
snd_pcm_poll_descriptors(handle, &pfd, err);
|
2007-06-14 19:39:12 +00:00
|
|
|
ast_debug(1, "Acquired fd %d from the poll descriptor\n", pfd.fd);
|
2004-04-11 01:59:11 +00:00
|
|
|
|
|
|
|
if (stream == SND_PCM_STREAM_CAPTURE)
|
|
|
|
readdev = pfd.fd;
|
|
|
|
else
|
|
|
|
writedev = pfd.fd;
|
|
|
|
|
2002-02-19 20:14:14 +00:00
|
|
|
return handle;
|
|
|
|
}
|
|
|
|
|
2003-03-16 22:37:31 +00:00
|
|
|
static int soundcard_init(void)
|
2002-02-19 20:14:14 +00:00
|
|
|
{
|
2009-11-12 23:37:36 +00:00
|
|
|
if (!noaudiocapture) {
|
|
|
|
alsa.icard = alsa_card_init(indevname, SND_PCM_STREAM_CAPTURE);
|
|
|
|
if (!alsa.icard) {
|
|
|
|
ast_log(LOG_ERROR, "Problem opening alsa capture device\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-04-11 01:59:11 +00:00
|
|
|
alsa.ocard = alsa_card_init(outdevname, SND_PCM_STREAM_PLAYBACK);
|
2002-02-19 20:14:14 +00:00
|
|
|
|
2009-11-12 23:37:36 +00:00
|
|
|
if (!alsa.ocard) {
|
|
|
|
ast_log(LOG_ERROR, "Problem opening ALSA playback device\n");
|
2002-02-19 20:14:14 +00:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2009-11-12 23:37:36 +00:00
|
|
|
return writedev;
|
2002-02-19 20:14:14 +00:00
|
|
|
}
|
|
|
|
|
Merged revisions 51311 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51311 | russell | 2007-01-19 11:49:38 -0600 (Fri, 19 Jan 2007) | 23 lines
Merge the changes from the /team/group/vldtmf_fixup branch.
The main bug being addressed here is a problem introduced when two SIP
channels using SIP INFO dtmf have their media directly bridged. So, when a
DTMF END frame comes into Asterisk from an incoming INFO message, Asterisk
would try to emulate a digit of some length by first sending a DTMF BEGIN
frame and sending a DTMF END later timed off of incoming audio. However,
since there was no audio coming in, the DTMF_END was never generated. This
caused DTMF based features to no longer work.
To fix this, the core now knows when a channel doesn't care about DTMF BEGIN
frames (such as a SIP channel sending INFO dtmf). If this is the case, then
Asterisk will not emulate a digit of some length, and will instead just pass
through the single DTMF END event.
Channel drivers also now get passed the length of the digit to their digit_end
callback. This improves SIP INFO support even further by enabling us to put
the real digit duration in the INFO message instead of a hard coded 250ms.
Also, for an incoming INFO message, the duration is read from the frame and
passed into the core instead of just getting ignored.
(issue #8597, maybe others...)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-19 18:06:03 +00:00
|
|
|
static int alsa_digit(struct ast_channel *c, char digit, unsigned int duration)
|
2002-02-19 20:14:14 +00:00
|
|
|
{
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_mutex_lock(&alsalock);
|
Merged revisions 51311 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r51311 | russell | 2007-01-19 11:49:38 -0600 (Fri, 19 Jan 2007) | 23 lines
Merge the changes from the /team/group/vldtmf_fixup branch.
The main bug being addressed here is a problem introduced when two SIP
channels using SIP INFO dtmf have their media directly bridged. So, when a
DTMF END frame comes into Asterisk from an incoming INFO message, Asterisk
would try to emulate a digit of some length by first sending a DTMF BEGIN
frame and sending a DTMF END later timed off of incoming audio. However,
since there was no audio coming in, the DTMF_END was never generated. This
caused DTMF based features to no longer work.
To fix this, the core now knows when a channel doesn't care about DTMF BEGIN
frames (such as a SIP channel sending INFO dtmf). If this is the case, then
Asterisk will not emulate a digit of some length, and will instead just pass
through the single DTMF END event.
Channel drivers also now get passed the length of the digit to their digit_end
callback. This improves SIP INFO support even further by enabling us to put
the real digit duration in the INFO message instead of a hard coded 250ms.
Also, for an incoming INFO message, the duration is read from the frame and
passed into the core instead of just getting ignored.
(issue #8597, maybe others...)
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51314 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-19 18:06:03 +00:00
|
|
|
ast_verbose(" << Console Received digit %c of duration %u ms >> \n",
|
|
|
|
digit, duration);
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_mutex_unlock(&alsalock);
|
2008-01-03 18:10:13 +00:00
|
|
|
|
2002-02-19 20:14:14 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-03-29 06:16:49 +00:00
|
|
|
static int alsa_text(struct ast_channel *c, const char *text)
|
2002-02-19 20:14:14 +00:00
|
|
|
{
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_mutex_lock(&alsalock);
|
2006-09-08 03:46:33 +00:00
|
|
|
ast_verbose(" << Console Received text %s >> \n", text);
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_mutex_unlock(&alsalock);
|
2008-01-03 18:10:13 +00:00
|
|
|
|
2002-02-19 20:14:14 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-06-26 05:20:42 +00:00
|
|
|
static void grab_owner(void)
|
|
|
|
{
|
2007-09-17 22:59:36 +00:00
|
|
|
while (alsa.owner && ast_channel_trylock(alsa.owner)) {
|
2008-05-29 17:35:19 +00:00
|
|
|
DEADLOCK_AVOIDANCE(&alsalock);
|
2004-06-26 05:20:42 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-02-01 19:53:38 +00:00
|
|
|
static int alsa_call(struct ast_channel *c, const char *dest, int timeout)
|
2002-02-19 20:14:14 +00:00
|
|
|
{
|
2004-06-26 05:20:42 +00:00
|
|
|
struct ast_frame f = { AST_FRAME_CONTROL };
|
2008-01-03 18:10:13 +00:00
|
|
|
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_mutex_lock(&alsalock);
|
2006-09-08 03:46:33 +00:00
|
|
|
ast_verbose(" << Call placed to '%s' on console >> \n", dest);
|
2002-02-19 20:14:14 +00:00
|
|
|
if (autoanswer) {
|
2006-09-08 03:46:33 +00:00
|
|
|
ast_verbose(" << Auto-answered >> \n");
|
2009-11-12 23:37:36 +00:00
|
|
|
if (mute) {
|
|
|
|
ast_verbose( " << Muted >> \n" );
|
|
|
|
}
|
2004-06-26 05:20:42 +00:00
|
|
|
grab_owner();
|
|
|
|
if (alsa.owner) {
|
2009-11-04 14:05:12 +00:00
|
|
|
f.subclass.integer = AST_CONTROL_ANSWER;
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_queue_frame(alsa.owner, &f);
|
2007-09-17 22:59:36 +00:00
|
|
|
ast_channel_unlock(alsa.owner);
|
2004-06-26 05:20:42 +00:00
|
|
|
}
|
2002-02-19 20:14:14 +00:00
|
|
|
} else {
|
2006-09-08 03:46:33 +00:00
|
|
|
ast_verbose(" << Type 'answer' to answer, or use 'autoanswer' for future calls >> \n");
|
2004-06-26 05:20:42 +00:00
|
|
|
grab_owner();
|
|
|
|
if (alsa.owner) {
|
2009-11-04 14:05:12 +00:00
|
|
|
f.subclass.integer = AST_CONTROL_RINGING;
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_queue_frame(alsa.owner, &f);
|
2007-09-17 22:59:36 +00:00
|
|
|
ast_channel_unlock(alsa.owner);
|
2008-01-03 18:10:13 +00:00
|
|
|
ast_indicate(alsa.owner, AST_CONTROL_RINGING);
|
2004-06-26 05:20:42 +00:00
|
|
|
}
|
2002-02-19 20:14:14 +00:00
|
|
|
}
|
2009-11-12 23:37:36 +00:00
|
|
|
if (!noaudiocapture) {
|
|
|
|
snd_pcm_prepare(alsa.icard);
|
|
|
|
snd_pcm_start(alsa.icard);
|
|
|
|
}
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_mutex_unlock(&alsalock);
|
2006-09-08 03:46:33 +00:00
|
|
|
|
2008-01-03 18:10:13 +00:00
|
|
|
return 0;
|
2002-02-19 20:14:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int alsa_answer(struct ast_channel *c)
|
|
|
|
{
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_mutex_lock(&alsalock);
|
2006-09-08 03:46:33 +00:00
|
|
|
ast_verbose(" << Console call has been answered >> \n");
|
2002-07-12 09:03:50 +00:00
|
|
|
ast_setstate(c, AST_STATE_UP);
|
2009-11-12 23:37:36 +00:00
|
|
|
if (!noaudiocapture) {
|
|
|
|
snd_pcm_prepare(alsa.icard);
|
|
|
|
snd_pcm_start(alsa.icard);
|
|
|
|
}
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_mutex_unlock(&alsalock);
|
2008-01-03 18:10:13 +00:00
|
|
|
|
2002-02-19 20:14:14 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int alsa_hangup(struct ast_channel *c)
|
|
|
|
{
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_mutex_lock(&alsalock);
|
2012-02-20 23:43:27 +00:00
|
|
|
ast_channel_tech_pvt_set(c, NULL);
|
2004-04-11 01:59:11 +00:00
|
|
|
alsa.owner = NULL;
|
2006-09-08 03:46:33 +00:00
|
|
|
ast_verbose(" << Hangup on console >> \n");
|
2007-01-23 22:59:55 +00:00
|
|
|
ast_module_unref(ast_module_info->self);
|
2008-01-03 18:10:13 +00:00
|
|
|
hookstate = 0;
|
2009-11-12 23:37:36 +00:00
|
|
|
if (!noaudiocapture) {
|
|
|
|
snd_pcm_drop(alsa.icard);
|
|
|
|
}
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_mutex_unlock(&alsalock);
|
2008-01-03 18:10:13 +00:00
|
|
|
|
2002-02-19 20:14:14 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int alsa_write(struct ast_channel *chan, struct ast_frame *f)
|
|
|
|
{
|
|
|
|
static char sizbuf[8000];
|
|
|
|
static int sizpos = 0;
|
|
|
|
int len = sizpos;
|
2004-06-26 05:20:42 +00:00
|
|
|
int res = 0;
|
2004-12-19 21:13:41 +00:00
|
|
|
/* size_t frames = 0; */
|
2002-02-19 20:14:14 +00:00
|
|
|
snd_pcm_state_t state;
|
2006-09-08 03:46:33 +00:00
|
|
|
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_mutex_lock(&alsalock);
|
2004-04-11 01:59:11 +00:00
|
|
|
|
|
|
|
/* We have to digest the frame in 160-byte portions */
|
|
|
|
if (f->datalen > sizeof(sizbuf) - sizpos) {
|
|
|
|
ast_log(LOG_WARNING, "Frame too large\n");
|
2004-06-26 05:20:42 +00:00
|
|
|
res = -1;
|
|
|
|
} else {
|
2008-05-22 16:29:54 +00:00
|
|
|
memcpy(sizbuf + sizpos, f->data.ptr, f->datalen);
|
2004-06-26 05:20:42 +00:00
|
|
|
len += f->datalen;
|
|
|
|
state = snd_pcm_state(alsa.ocard);
|
2006-09-08 03:46:33 +00:00
|
|
|
if (state == SND_PCM_STATE_XRUN)
|
2004-06-26 05:20:42 +00:00
|
|
|
snd_pcm_prepare(alsa.ocard);
|
2009-01-12 23:45:51 +00:00
|
|
|
while ((res = snd_pcm_writei(alsa.ocard, sizbuf, len / 2)) == -EAGAIN) {
|
|
|
|
usleep(1);
|
|
|
|
}
|
2004-06-26 05:20:42 +00:00
|
|
|
if (res == -EPIPE) {
|
2002-02-19 20:14:14 +00:00
|
|
|
#if DEBUG
|
2007-06-14 19:39:12 +00:00
|
|
|
ast_debug(1, "XRUN write\n");
|
2002-02-19 20:14:14 +00:00
|
|
|
#endif
|
2004-06-26 05:20:42 +00:00
|
|
|
snd_pcm_prepare(alsa.ocard);
|
2009-01-12 23:45:51 +00:00
|
|
|
while ((res = snd_pcm_writei(alsa.ocard, sizbuf, len / 2)) == -EAGAIN) {
|
|
|
|
usleep(1);
|
|
|
|
}
|
2006-09-08 03:46:33 +00:00
|
|
|
if (res != len / 2) {
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_log(LOG_ERROR, "Write error: %s\n", snd_strerror(res));
|
|
|
|
res = -1;
|
|
|
|
} else if (res < 0) {
|
|
|
|
ast_log(LOG_ERROR, "Write error %s\n", snd_strerror(res));
|
|
|
|
res = -1;
|
|
|
|
}
|
|
|
|
} else {
|
2006-09-08 03:46:33 +00:00
|
|
|
if (res == -ESTRPIPE)
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_log(LOG_ERROR, "You've got some big problems\n");
|
2006-09-08 03:46:33 +00:00
|
|
|
else if (res < 0)
|
2004-11-28 21:28:30 +00:00
|
|
|
ast_log(LOG_NOTICE, "Error %d on write\n", res);
|
2002-02-19 20:14:14 +00:00
|
|
|
}
|
|
|
|
}
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_mutex_unlock(&alsalock);
|
2008-01-03 18:10:13 +00:00
|
|
|
|
|
|
|
return res >= 0 ? 0 : res;
|
2002-02-19 20:14:14 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static struct ast_frame *alsa_read(struct ast_channel *chan)
|
|
|
|
{
|
|
|
|
static struct ast_frame f;
|
2006-09-08 03:46:33 +00:00
|
|
|
static short __buf[FRAME_SIZE + AST_FRIENDLY_OFFSET / 2];
|
2002-02-19 20:14:14 +00:00
|
|
|
short *buf;
|
|
|
|
static int readpos = 0;
|
2004-04-11 01:59:11 +00:00
|
|
|
static int left = FRAME_SIZE;
|
2002-02-19 20:14:14 +00:00
|
|
|
snd_pcm_state_t state;
|
|
|
|
int r = 0;
|
2004-04-11 01:59:11 +00:00
|
|
|
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_mutex_lock(&alsalock);
|
2002-02-19 20:14:14 +00:00
|
|
|
f.frametype = AST_FRAME_NULL;
|
2009-11-04 14:05:12 +00:00
|
|
|
f.subclass.integer = 0;
|
2002-11-29 02:14:13 +00:00
|
|
|
f.samples = 0;
|
2002-02-19 20:14:14 +00:00
|
|
|
f.datalen = 0;
|
2008-05-22 16:29:54 +00:00
|
|
|
f.data.ptr = NULL;
|
2002-02-19 20:14:14 +00:00
|
|
|
f.offset = 0;
|
2006-02-01 23:05:28 +00:00
|
|
|
f.src = "Console";
|
2002-02-19 20:14:14 +00:00
|
|
|
f.mallocd = 0;
|
2004-06-26 05:20:42 +00:00
|
|
|
f.delivery.tv_sec = 0;
|
|
|
|
f.delivery.tv_usec = 0;
|
2004-06-24 13:27:44 +00:00
|
|
|
|
2009-11-12 23:37:36 +00:00
|
|
|
if (noaudiocapture) {
|
|
|
|
/* Return null frame to asterisk*/
|
|
|
|
ast_mutex_unlock(&alsalock);
|
|
|
|
return &f;
|
|
|
|
}
|
|
|
|
|
2004-07-27 02:46:24 +00:00
|
|
|
state = snd_pcm_state(alsa.icard);
|
2006-09-08 03:46:33 +00:00
|
|
|
if ((state != SND_PCM_STATE_PREPARED) && (state != SND_PCM_STATE_RUNNING)) {
|
2004-07-27 02:46:24 +00:00
|
|
|
snd_pcm_prepare(alsa.icard);
|
2002-02-19 20:14:14 +00:00
|
|
|
}
|
|
|
|
|
2006-09-08 03:46:33 +00:00
|
|
|
buf = __buf + AST_FRIENDLY_OFFSET / 2;
|
2002-02-19 20:14:14 +00:00
|
|
|
|
2004-04-11 01:59:11 +00:00
|
|
|
r = snd_pcm_readi(alsa.icard, buf + readpos, left);
|
2002-02-19 20:14:14 +00:00
|
|
|
if (r == -EPIPE) {
|
|
|
|
#if DEBUG
|
|
|
|
ast_log(LOG_ERROR, "XRUN read\n");
|
|
|
|
#endif
|
2004-04-11 01:59:11 +00:00
|
|
|
snd_pcm_prepare(alsa.icard);
|
2002-02-19 20:14:14 +00:00
|
|
|
} else if (r == -ESTRPIPE) {
|
|
|
|
ast_log(LOG_ERROR, "-ESTRPIPE\n");
|
2004-04-11 01:59:11 +00:00
|
|
|
snd_pcm_prepare(alsa.icard);
|
2002-02-19 20:14:14 +00:00
|
|
|
} else if (r < 0) {
|
|
|
|
ast_log(LOG_ERROR, "Read error: %s\n", snd_strerror(r));
|
|
|
|
}
|
2013-04-14 02:35:04 +00:00
|
|
|
|
|
|
|
/* Return NULL frame on error */
|
|
|
|
if (r < 0) {
|
|
|
|
ast_mutex_unlock(&alsalock);
|
|
|
|
return &f;
|
|
|
|
}
|
|
|
|
|
2002-02-19 20:14:14 +00:00
|
|
|
/* Update positions */
|
|
|
|
readpos += r;
|
|
|
|
left -= r;
|
|
|
|
|
2004-04-11 01:59:11 +00:00
|
|
|
if (readpos >= FRAME_SIZE) {
|
2002-02-19 20:14:14 +00:00
|
|
|
/* A real frame */
|
|
|
|
readpos = 0;
|
2004-04-11 01:59:11 +00:00
|
|
|
left = FRAME_SIZE;
|
2012-02-20 23:43:27 +00:00
|
|
|
if (ast_channel_state(chan) != AST_STATE_UP) {
|
2002-02-19 20:14:14 +00:00
|
|
|
/* Don't transmit unless it's up */
|
2004-06-26 15:48:30 +00:00
|
|
|
ast_mutex_unlock(&alsalock);
|
2002-02-19 20:14:14 +00:00
|
|
|
return &f;
|
|
|
|
}
|
2009-11-12 23:37:36 +00:00
|
|
|
if (mute) {
|
|
|
|
/* Don't transmit if muted */
|
|
|
|
ast_mutex_unlock(&alsalock);
|
|
|
|
return &f;
|
|
|
|
}
|
|
|
|
|
2002-02-19 20:14:14 +00:00
|
|
|
f.frametype = AST_FRAME_VOICE;
|
media formats: re-architect handling of media for performance improvements
In the old times media formats were represented using a bit field. This was
fast but had a few limitations.
1. Asterisk was limited in how many formats it could handle.
2. Formats, being a bit field, could not include any attribute information.
A format was strictly its type, e.g., "this is ulaw".
This was changed in Asterisk 10 (see
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal for
notes on that work) which led to the creation of the ast_format structure.
This structure allowed Asterisk to handle attributes and bundle information
with a format.
Additionally, ast_format_cap was created to act as a container for multiple
formats that, together, formed the capability of some entity. Another
mechanism was added to allow logic to be registered which performed format
attribute negotiation. Everywhere throughout the codebase Asterisk was
changed to use this strategy.
Unfortunately, in software, there is no free lunch. These new capabilities
came at a cost.
Performance analysis and profiling showed that we spend an inordinate
amount of time comparing, copying, and generally manipulating formats and
their related structures. Basic prototyping has shown that a reasonably
large performance improvement could be made in this area. This patch is the
result of that project, which overhauled the media format architecture
and its usage in Asterisk to improve performance.
Generally, the new philosophy for handling formats is as follows:
* The ast_format structure is reference counted. This removed a large amount
of the memory allocations and copying that was done in prior versions.
* In order to prevent race conditions while keeping things performant, the
ast_format structure is immutable by convention and lock-free. Violate this
tenet at your peril!
* Because formats are reference counted, codecs are also reference counted.
The Asterisk core generally provides built-in codecs and caches the
ast_format structures created to represent them. Generally, to prevent
inordinate amounts of module reference bumping, codecs and formats can be
added at run-time but cannot be removed.
* All compatibility with the bit field representation of codecs/formats has
been moved to a compatibility API. The primary user of this representation
is chan_iax2, which must continue to maintain its bit-field usage of formats
for interoperability concerns.
* When a format is negotiated with attributes, or when a format cannot be
represented by one of the cached formats, a new format object is created or
cloned from an existing format. That format may have the same codec
underlying it, but is a different format than a version of the format with
different attributes or without attributes.
* While formats are reference counted objects, the reference count maintained
on the format should be manipulated with care. Formats are generally cached
and will persist for the lifetime of Asterisk and do not explicitly need
to have their lifetime modified. An exception to this is when the user of a
format does not know where the format came from *and* the user may outlive
the provider of the format. This occurs, for example, when a format is read
from a channel: the channel may have a format with attributes (hence,
non-cached) and the user of the format may last longer than the channel (if
the reference to the channel is released prior to the format's reference).
For more information on this work, see the API design notes:
https://wiki.asterisk.org/wiki/display/AST/Media+Format+Rewrite
Finally, this work was the culmination of a large number of developer's
efforts. Extra thanks goes to Corey Farrell, who took on a large amount of the
work in the Asterisk core, chan_sip, and was an invaluable resource in peer
reviews throughout this project.
There were a substantial number of patches contributed during this work; the
following issues/patch names simply reflect some of the work (and will cause
the release scripts to give attribution to the individuals who work on them).
Reviews:
https://reviewboard.asterisk.org/r/3814
https://reviewboard.asterisk.org/r/3808
https://reviewboard.asterisk.org/r/3805
https://reviewboard.asterisk.org/r/3803
https://reviewboard.asterisk.org/r/3801
https://reviewboard.asterisk.org/r/3798
https://reviewboard.asterisk.org/r/3800
https://reviewboard.asterisk.org/r/3794
https://reviewboard.asterisk.org/r/3793
https://reviewboard.asterisk.org/r/3792
https://reviewboard.asterisk.org/r/3791
https://reviewboard.asterisk.org/r/3790
https://reviewboard.asterisk.org/r/3789
https://reviewboard.asterisk.org/r/3788
https://reviewboard.asterisk.org/r/3787
https://reviewboard.asterisk.org/r/3786
https://reviewboard.asterisk.org/r/3784
https://reviewboard.asterisk.org/r/3783
https://reviewboard.asterisk.org/r/3778
https://reviewboard.asterisk.org/r/3774
https://reviewboard.asterisk.org/r/3775
https://reviewboard.asterisk.org/r/3772
https://reviewboard.asterisk.org/r/3761
https://reviewboard.asterisk.org/r/3754
https://reviewboard.asterisk.org/r/3753
https://reviewboard.asterisk.org/r/3751
https://reviewboard.asterisk.org/r/3750
https://reviewboard.asterisk.org/r/3748
https://reviewboard.asterisk.org/r/3747
https://reviewboard.asterisk.org/r/3746
https://reviewboard.asterisk.org/r/3742
https://reviewboard.asterisk.org/r/3740
https://reviewboard.asterisk.org/r/3739
https://reviewboard.asterisk.org/r/3738
https://reviewboard.asterisk.org/r/3737
https://reviewboard.asterisk.org/r/3736
https://reviewboard.asterisk.org/r/3734
https://reviewboard.asterisk.org/r/3722
https://reviewboard.asterisk.org/r/3713
https://reviewboard.asterisk.org/r/3703
https://reviewboard.asterisk.org/r/3689
https://reviewboard.asterisk.org/r/3687
https://reviewboard.asterisk.org/r/3674
https://reviewboard.asterisk.org/r/3671
https://reviewboard.asterisk.org/r/3667
https://reviewboard.asterisk.org/r/3665
https://reviewboard.asterisk.org/r/3625
https://reviewboard.asterisk.org/r/3602
https://reviewboard.asterisk.org/r/3519
https://reviewboard.asterisk.org/r/3518
https://reviewboard.asterisk.org/r/3516
https://reviewboard.asterisk.org/r/3515
https://reviewboard.asterisk.org/r/3512
https://reviewboard.asterisk.org/r/3506
https://reviewboard.asterisk.org/r/3413
https://reviewboard.asterisk.org/r/3410
https://reviewboard.asterisk.org/r/3387
https://reviewboard.asterisk.org/r/3388
https://reviewboard.asterisk.org/r/3389
https://reviewboard.asterisk.org/r/3390
https://reviewboard.asterisk.org/r/3321
https://reviewboard.asterisk.org/r/3320
https://reviewboard.asterisk.org/r/3319
https://reviewboard.asterisk.org/r/3318
https://reviewboard.asterisk.org/r/3266
https://reviewboard.asterisk.org/r/3265
https://reviewboard.asterisk.org/r/3234
https://reviewboard.asterisk.org/r/3178
ASTERISK-23114 #close
Reported by: mjordan
media_formats_translation_core.diff uploaded by kharwell (License 6464)
rb3506.diff uploaded by mjordan (License 6283)
media_format_app_file.diff uploaded by kharwell (License 6464)
misc-2.diff uploaded by file (License 5000)
chan_mild-3.diff uploaded by file (License 5000)
chan_obscure.diff uploaded by file (License 5000)
jingle.diff uploaded by file (License 5000)
funcs.diff uploaded by file (License 5000)
formats.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
bridges.diff uploaded by file (License 5000)
mf-codecs-2.diff uploaded by file (License 5000)
mf-app_fax.diff uploaded by file (License 5000)
mf-apps-3.diff uploaded by file (License 5000)
media-formats-3.diff uploaded by file (License 5000)
ASTERISK-23715
rb3713.patch uploaded by coreyfarrell (License 5909)
rb3689.patch uploaded by mjordan (License 6283)
ASTERISK-23957
rb3722.patch uploaded by mjordan (License 6283)
mf-attributes-3.diff uploaded by file (License 5000)
ASTERISK-23958
Tested by: jrose
rb3822.patch uploaded by coreyfarrell (License 5909)
rb3800.patch uploaded by jrose (License 6182)
chan_sip.diff uploaded by mjordan (License 6283)
rb3747.patch uploaded by jrose (License 6182)
ASTERISK-23959 #close
Tested by: sgriepentrog, mjordan, coreyfarrell
sip_cleanup.diff uploaded by opticron (License 6273)
chan_sip_caps.diff uploaded by mjordan (License 6283)
rb3751.patch uploaded by coreyfarrell (License 5909)
chan_sip-3.diff uploaded by file (License 5000)
ASTERISK-23960 #close
Tested by: opticron
direct_media.diff uploaded by opticron (License 6273)
pjsip-direct-media.diff uploaded by file (License 5000)
format_cap_remove.diff uploaded by opticron (License 6273)
media_format_fixes.diff uploaded by opticron (License 6273)
chan_pjsip-2.diff uploaded by file (License 5000)
ASTERISK-23966 #close
Tested by: rmudgett
rb3803.patch uploaded by rmudgetti (License 5621)
chan_dahdi.diff uploaded by file (License 5000)
ASTERISK-24064 #close
Tested by: coreyfarrell, mjordan, opticron, file, rmudgett, sgriepentrog, jrose
rb3814.patch uploaded by rmudgett (License 5621)
moh_cleanup.diff uploaded by opticron (License 6273)
bridge_leak.diff uploaded by opticron (License 6273)
translate.diff uploaded by file (License 5000)
rb3795.patch uploaded by rmudgett (License 5621)
tls_fix.diff uploaded by mjordan (License 6283)
fax-mf-fix-2.diff uploaded by file (License 5000)
rtp_transfer_stuff uploaded by mjordan (License 6283)
rb3787.patch uploaded by rmudgett (License 5621)
media-formats-explicit-translate-format-3.diff uploaded by file (License 5000)
format_cache_case_fix.diff uploaded by opticron (License 6273)
rb3774.patch uploaded by rmudgett (License 5621)
rb3775.patch uploaded by rmudgett (License 5621)
rtp_engine_fix.diff uploaded by opticron (License 6273)
rtp_crash_fix.diff uploaded by opticron (License 6273)
rb3753.patch uploaded by mjordan (License 6283)
rb3750.patch uploaded by mjordan (License 6283)
rb3748.patch uploaded by rmudgett (License 5621)
media_format_fixes.diff uploaded by opticron (License 6273)
rb3740.patch uploaded by mjordan (License 6283)
rb3739.patch uploaded by mjordan (License 6283)
rb3734.patch uploaded by mjordan (License 6283)
rb3689.patch uploaded by mjordan (License 6283)
rb3674.patch uploaded by coreyfarrell (License 5909)
rb3671.patch uploaded by coreyfarrell (License 5909)
rb3667.patch uploaded by coreyfarrell (License 5909)
rb3665.patch uploaded by mjordan (License 6283)
rb3625.patch uploaded by coreyfarrell (License 5909)
rb3602.patch uploaded by coreyfarrell (License 5909)
format_compatibility-2.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-07-20 22:06:33 +00:00
|
|
|
f.subclass.format = ast_format_slin;
|
2004-04-11 01:59:11 +00:00
|
|
|
f.samples = FRAME_SIZE;
|
|
|
|
f.datalen = FRAME_SIZE * 2;
|
2008-05-22 16:29:54 +00:00
|
|
|
f.data.ptr = buf;
|
2002-02-19 20:14:14 +00:00
|
|
|
f.offset = AST_FRIENDLY_OFFSET;
|
2006-02-01 23:05:28 +00:00
|
|
|
f.src = "Console";
|
2002-02-19 20:14:14 +00:00
|
|
|
f.mallocd = 0;
|
|
|
|
|
|
|
|
}
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_mutex_unlock(&alsalock);
|
2008-01-03 18:10:13 +00:00
|
|
|
|
2002-02-19 20:14:14 +00:00
|
|
|
return &f;
|
|
|
|
}
|
|
|
|
|
2004-04-08 19:19:24 +00:00
|
|
|
static int alsa_fixup(struct ast_channel *oldchan, struct ast_channel *newchan)
|
2002-02-19 20:14:14 +00:00
|
|
|
{
|
2012-02-20 23:43:27 +00:00
|
|
|
struct chan_alsa_pvt *p = ast_channel_tech_pvt(newchan);
|
2008-01-03 18:10:13 +00:00
|
|
|
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_mutex_lock(&alsalock);
|
2002-02-19 20:14:14 +00:00
|
|
|
p->owner = newchan;
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_mutex_unlock(&alsalock);
|
2008-01-03 18:10:13 +00:00
|
|
|
|
2002-02-19 20:14:14 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2006-05-10 12:24:11 +00:00
|
|
|
static int alsa_indicate(struct ast_channel *chan, int cond, const void *data, size_t datalen)
|
2002-02-19 20:14:14 +00:00
|
|
|
{
|
2004-06-26 05:20:42 +00:00
|
|
|
int res = 0;
|
2006-07-19 20:44:39 +00:00
|
|
|
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_mutex_lock(&alsalock);
|
2006-09-08 03:46:33 +00:00
|
|
|
|
|
|
|
switch (cond) {
|
2008-01-03 18:10:13 +00:00
|
|
|
case AST_CONTROL_BUSY:
|
|
|
|
case AST_CONTROL_CONGESTION:
|
|
|
|
case AST_CONTROL_RINGING:
|
2011-09-09 16:28:23 +00:00
|
|
|
case AST_CONTROL_INCOMPLETE:
|
2012-05-14 19:44:27 +00:00
|
|
|
case AST_CONTROL_PVT_CAUSE_CODE:
|
2008-01-03 18:10:13 +00:00
|
|
|
case -1:
|
|
|
|
res = -1; /* Ask for inband indications */
|
|
|
|
break;
|
|
|
|
case AST_CONTROL_PROGRESS:
|
|
|
|
case AST_CONTROL_PROCEEDING:
|
|
|
|
case AST_CONTROL_VIDUPDATE:
|
2008-03-05 22:43:22 +00:00
|
|
|
case AST_CONTROL_SRCUPDATE:
|
2008-01-03 18:10:13 +00:00
|
|
|
break;
|
|
|
|
case AST_CONTROL_HOLD:
|
|
|
|
ast_verbose(" << Console Has Been Placed on Hold >> \n");
|
|
|
|
ast_moh_start(chan, data, mohinterpret);
|
|
|
|
break;
|
|
|
|
case AST_CONTROL_UNHOLD:
|
|
|
|
ast_verbose(" << Console Has Been Retrieved from Hold >> \n");
|
|
|
|
ast_moh_stop(chan);
|
|
|
|
break;
|
|
|
|
default:
|
2012-01-09 22:15:50 +00:00
|
|
|
ast_log(LOG_WARNING, "Don't know how to display condition %d on %s\n", cond, ast_channel_name(chan));
|
2008-01-03 18:10:13 +00:00
|
|
|
res = -1;
|
2002-02-19 20:14:14 +00:00
|
|
|
}
|
2006-09-08 03:46:33 +00:00
|
|
|
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_mutex_unlock(&alsalock);
|
2006-07-19 20:44:39 +00:00
|
|
|
|
2006-09-08 03:46:33 +00:00
|
|
|
return res;
|
2002-02-19 20:14:14 +00:00
|
|
|
}
|
|
|
|
|
uniqueid: channel linkedid, ami, ari object creation with id's
Much needed was a way to assign id to objects on creation, and
much change was necessary to accomplish it. Channel uniqueids
and linkedids are split into separate string and creation time
components without breaking linkedid propgation. This allowed
the uniqueid to be specified by the user interface - and those
values are now carried through to channel creation, adding the
assignedids value to every function in the chain including the
channel drivers. For local channels, the second channel can be
specified or left to default to a ;2 suffix of first. In ARI,
bridge, playback, and snoop objects can also be created with a
specified uniqueid.
Along the way, the args order to allocating channels was fixed
in chan_mgcp and chan_gtalk, and linkedid is no longer lost as
masquerade occurs.
(closes issue ASTERISK-23120)
Review: https://reviewboard.asterisk.org/r/3191/
........
Merged revisions 410157 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-03-07 15:47:55 +00:00
|
|
|
static struct ast_channel *alsa_new(struct chan_alsa_pvt *p, int state, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor)
|
2002-02-19 20:14:14 +00:00
|
|
|
{
|
2006-09-08 03:46:33 +00:00
|
|
|
struct ast_channel *tmp = NULL;
|
2006-09-21 22:32:28 +00:00
|
|
|
|
uniqueid: channel linkedid, ami, ari object creation with id's
Much needed was a way to assign id to objects on creation, and
much change was necessary to accomplish it. Channel uniqueids
and linkedids are split into separate string and creation time
components without breaking linkedid propgation. This allowed
the uniqueid to be specified by the user interface - and those
values are now carried through to channel creation, adding the
assignedids value to every function in the chain including the
channel drivers. For local channels, the second channel can be
specified or left to default to a ;2 suffix of first. In ARI,
bridge, playback, and snoop objects can also be created with a
specified uniqueid.
Along the way, the args order to allocating channels was fixed
in chan_mgcp and chan_gtalk, and linkedid is no longer lost as
masquerade occurs.
(closes issue ASTERISK-23120)
Review: https://reviewboard.asterisk.org/r/3191/
........
Merged revisions 410157 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-03-07 15:47:55 +00:00
|
|
|
if (!(tmp = ast_channel_alloc(1, state, 0, 0, "", p->exten, p->context, assignedids, requestor, 0, "ALSA/%s", indevname)))
|
2006-09-08 03:46:33 +00:00
|
|
|
return NULL;
|
|
|
|
|
2013-10-02 16:23:34 +00:00
|
|
|
ast_channel_stage_snapshot(tmp);
|
|
|
|
|
2012-02-20 23:43:27 +00:00
|
|
|
ast_channel_tech_set(tmp, &alsa_tech);
|
2007-08-08 21:44:58 +00:00
|
|
|
ast_channel_set_fd(tmp, 0, readdev);
|
media formats: re-architect handling of media for performance improvements
In the old times media formats were represented using a bit field. This was
fast but had a few limitations.
1. Asterisk was limited in how many formats it could handle.
2. Formats, being a bit field, could not include any attribute information.
A format was strictly its type, e.g., "this is ulaw".
This was changed in Asterisk 10 (see
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal for
notes on that work) which led to the creation of the ast_format structure.
This structure allowed Asterisk to handle attributes and bundle information
with a format.
Additionally, ast_format_cap was created to act as a container for multiple
formats that, together, formed the capability of some entity. Another
mechanism was added to allow logic to be registered which performed format
attribute negotiation. Everywhere throughout the codebase Asterisk was
changed to use this strategy.
Unfortunately, in software, there is no free lunch. These new capabilities
came at a cost.
Performance analysis and profiling showed that we spend an inordinate
amount of time comparing, copying, and generally manipulating formats and
their related structures. Basic prototyping has shown that a reasonably
large performance improvement could be made in this area. This patch is the
result of that project, which overhauled the media format architecture
and its usage in Asterisk to improve performance.
Generally, the new philosophy for handling formats is as follows:
* The ast_format structure is reference counted. This removed a large amount
of the memory allocations and copying that was done in prior versions.
* In order to prevent race conditions while keeping things performant, the
ast_format structure is immutable by convention and lock-free. Violate this
tenet at your peril!
* Because formats are reference counted, codecs are also reference counted.
The Asterisk core generally provides built-in codecs and caches the
ast_format structures created to represent them. Generally, to prevent
inordinate amounts of module reference bumping, codecs and formats can be
added at run-time but cannot be removed.
* All compatibility with the bit field representation of codecs/formats has
been moved to a compatibility API. The primary user of this representation
is chan_iax2, which must continue to maintain its bit-field usage of formats
for interoperability concerns.
* When a format is negotiated with attributes, or when a format cannot be
represented by one of the cached formats, a new format object is created or
cloned from an existing format. That format may have the same codec
underlying it, but is a different format than a version of the format with
different attributes or without attributes.
* While formats are reference counted objects, the reference count maintained
on the format should be manipulated with care. Formats are generally cached
and will persist for the lifetime of Asterisk and do not explicitly need
to have their lifetime modified. An exception to this is when the user of a
format does not know where the format came from *and* the user may outlive
the provider of the format. This occurs, for example, when a format is read
from a channel: the channel may have a format with attributes (hence,
non-cached) and the user of the format may last longer than the channel (if
the reference to the channel is released prior to the format's reference).
For more information on this work, see the API design notes:
https://wiki.asterisk.org/wiki/display/AST/Media+Format+Rewrite
Finally, this work was the culmination of a large number of developer's
efforts. Extra thanks goes to Corey Farrell, who took on a large amount of the
work in the Asterisk core, chan_sip, and was an invaluable resource in peer
reviews throughout this project.
There were a substantial number of patches contributed during this work; the
following issues/patch names simply reflect some of the work (and will cause
the release scripts to give attribution to the individuals who work on them).
Reviews:
https://reviewboard.asterisk.org/r/3814
https://reviewboard.asterisk.org/r/3808
https://reviewboard.asterisk.org/r/3805
https://reviewboard.asterisk.org/r/3803
https://reviewboard.asterisk.org/r/3801
https://reviewboard.asterisk.org/r/3798
https://reviewboard.asterisk.org/r/3800
https://reviewboard.asterisk.org/r/3794
https://reviewboard.asterisk.org/r/3793
https://reviewboard.asterisk.org/r/3792
https://reviewboard.asterisk.org/r/3791
https://reviewboard.asterisk.org/r/3790
https://reviewboard.asterisk.org/r/3789
https://reviewboard.asterisk.org/r/3788
https://reviewboard.asterisk.org/r/3787
https://reviewboard.asterisk.org/r/3786
https://reviewboard.asterisk.org/r/3784
https://reviewboard.asterisk.org/r/3783
https://reviewboard.asterisk.org/r/3778
https://reviewboard.asterisk.org/r/3774
https://reviewboard.asterisk.org/r/3775
https://reviewboard.asterisk.org/r/3772
https://reviewboard.asterisk.org/r/3761
https://reviewboard.asterisk.org/r/3754
https://reviewboard.asterisk.org/r/3753
https://reviewboard.asterisk.org/r/3751
https://reviewboard.asterisk.org/r/3750
https://reviewboard.asterisk.org/r/3748
https://reviewboard.asterisk.org/r/3747
https://reviewboard.asterisk.org/r/3746
https://reviewboard.asterisk.org/r/3742
https://reviewboard.asterisk.org/r/3740
https://reviewboard.asterisk.org/r/3739
https://reviewboard.asterisk.org/r/3738
https://reviewboard.asterisk.org/r/3737
https://reviewboard.asterisk.org/r/3736
https://reviewboard.asterisk.org/r/3734
https://reviewboard.asterisk.org/r/3722
https://reviewboard.asterisk.org/r/3713
https://reviewboard.asterisk.org/r/3703
https://reviewboard.asterisk.org/r/3689
https://reviewboard.asterisk.org/r/3687
https://reviewboard.asterisk.org/r/3674
https://reviewboard.asterisk.org/r/3671
https://reviewboard.asterisk.org/r/3667
https://reviewboard.asterisk.org/r/3665
https://reviewboard.asterisk.org/r/3625
https://reviewboard.asterisk.org/r/3602
https://reviewboard.asterisk.org/r/3519
https://reviewboard.asterisk.org/r/3518
https://reviewboard.asterisk.org/r/3516
https://reviewboard.asterisk.org/r/3515
https://reviewboard.asterisk.org/r/3512
https://reviewboard.asterisk.org/r/3506
https://reviewboard.asterisk.org/r/3413
https://reviewboard.asterisk.org/r/3410
https://reviewboard.asterisk.org/r/3387
https://reviewboard.asterisk.org/r/3388
https://reviewboard.asterisk.org/r/3389
https://reviewboard.asterisk.org/r/3390
https://reviewboard.asterisk.org/r/3321
https://reviewboard.asterisk.org/r/3320
https://reviewboard.asterisk.org/r/3319
https://reviewboard.asterisk.org/r/3318
https://reviewboard.asterisk.org/r/3266
https://reviewboard.asterisk.org/r/3265
https://reviewboard.asterisk.org/r/3234
https://reviewboard.asterisk.org/r/3178
ASTERISK-23114 #close
Reported by: mjordan
media_formats_translation_core.diff uploaded by kharwell (License 6464)
rb3506.diff uploaded by mjordan (License 6283)
media_format_app_file.diff uploaded by kharwell (License 6464)
misc-2.diff uploaded by file (License 5000)
chan_mild-3.diff uploaded by file (License 5000)
chan_obscure.diff uploaded by file (License 5000)
jingle.diff uploaded by file (License 5000)
funcs.diff uploaded by file (License 5000)
formats.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
bridges.diff uploaded by file (License 5000)
mf-codecs-2.diff uploaded by file (License 5000)
mf-app_fax.diff uploaded by file (License 5000)
mf-apps-3.diff uploaded by file (License 5000)
media-formats-3.diff uploaded by file (License 5000)
ASTERISK-23715
rb3713.patch uploaded by coreyfarrell (License 5909)
rb3689.patch uploaded by mjordan (License 6283)
ASTERISK-23957
rb3722.patch uploaded by mjordan (License 6283)
mf-attributes-3.diff uploaded by file (License 5000)
ASTERISK-23958
Tested by: jrose
rb3822.patch uploaded by coreyfarrell (License 5909)
rb3800.patch uploaded by jrose (License 6182)
chan_sip.diff uploaded by mjordan (License 6283)
rb3747.patch uploaded by jrose (License 6182)
ASTERISK-23959 #close
Tested by: sgriepentrog, mjordan, coreyfarrell
sip_cleanup.diff uploaded by opticron (License 6273)
chan_sip_caps.diff uploaded by mjordan (License 6283)
rb3751.patch uploaded by coreyfarrell (License 5909)
chan_sip-3.diff uploaded by file (License 5000)
ASTERISK-23960 #close
Tested by: opticron
direct_media.diff uploaded by opticron (License 6273)
pjsip-direct-media.diff uploaded by file (License 5000)
format_cap_remove.diff uploaded by opticron (License 6273)
media_format_fixes.diff uploaded by opticron (License 6273)
chan_pjsip-2.diff uploaded by file (License 5000)
ASTERISK-23966 #close
Tested by: rmudgett
rb3803.patch uploaded by rmudgetti (License 5621)
chan_dahdi.diff uploaded by file (License 5000)
ASTERISK-24064 #close
Tested by: coreyfarrell, mjordan, opticron, file, rmudgett, sgriepentrog, jrose
rb3814.patch uploaded by rmudgett (License 5621)
moh_cleanup.diff uploaded by opticron (License 6273)
bridge_leak.diff uploaded by opticron (License 6273)
translate.diff uploaded by file (License 5000)
rb3795.patch uploaded by rmudgett (License 5621)
tls_fix.diff uploaded by mjordan (License 6283)
fax-mf-fix-2.diff uploaded by file (License 5000)
rtp_transfer_stuff uploaded by mjordan (License 6283)
rb3787.patch uploaded by rmudgett (License 5621)
media-formats-explicit-translate-format-3.diff uploaded by file (License 5000)
format_cache_case_fix.diff uploaded by opticron (License 6273)
rb3774.patch uploaded by rmudgett (License 5621)
rb3775.patch uploaded by rmudgett (License 5621)
rtp_engine_fix.diff uploaded by opticron (License 6273)
rtp_crash_fix.diff uploaded by opticron (License 6273)
rb3753.patch uploaded by mjordan (License 6283)
rb3750.patch uploaded by mjordan (License 6283)
rb3748.patch uploaded by rmudgett (License 5621)
media_format_fixes.diff uploaded by opticron (License 6273)
rb3740.patch uploaded by mjordan (License 6283)
rb3739.patch uploaded by mjordan (License 6283)
rb3734.patch uploaded by mjordan (License 6283)
rb3689.patch uploaded by mjordan (License 6283)
rb3674.patch uploaded by coreyfarrell (License 5909)
rb3671.patch uploaded by coreyfarrell (License 5909)
rb3667.patch uploaded by coreyfarrell (License 5909)
rb3665.patch uploaded by mjordan (License 6283)
rb3625.patch uploaded by coreyfarrell (License 5909)
rb3602.patch uploaded by coreyfarrell (License 5909)
format_compatibility-2.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-07-20 22:06:33 +00:00
|
|
|
ast_channel_set_readformat(tmp, ast_format_slin);
|
|
|
|
ast_channel_set_writeformat(tmp, ast_format_slin);
|
|
|
|
ast_channel_nativeformats_set(tmp, alsa_tech.capabilities);
|
2011-02-03 16:22:10 +00:00
|
|
|
|
2012-02-20 23:43:27 +00:00
|
|
|
ast_channel_tech_pvt_set(tmp, p);
|
2006-09-08 03:46:33 +00:00
|
|
|
if (!ast_strlen_zero(p->context))
|
2012-02-13 17:27:06 +00:00
|
|
|
ast_channel_context_set(tmp, p->context);
|
2006-09-08 03:46:33 +00:00
|
|
|
if (!ast_strlen_zero(p->exten))
|
2012-02-13 17:27:06 +00:00
|
|
|
ast_channel_exten_set(tmp, p->exten);
|
2006-09-08 03:46:33 +00:00
|
|
|
if (!ast_strlen_zero(language))
|
2012-01-24 20:12:09 +00:00
|
|
|
ast_channel_language_set(tmp, language);
|
2006-09-08 03:46:33 +00:00
|
|
|
p->owner = tmp;
|
2007-01-23 22:59:55 +00:00
|
|
|
ast_module_ref(ast_module_info->self);
|
2006-09-08 03:46:33 +00:00
|
|
|
ast_jb_configure(tmp, &global_jbconf);
|
2013-10-02 16:23:34 +00:00
|
|
|
|
|
|
|
ast_channel_stage_snapshot_done(tmp);
|
2013-12-18 19:28:05 +00:00
|
|
|
ast_channel_unlock(tmp);
|
|
|
|
|
2006-09-08 03:46:33 +00:00
|
|
|
if (state != AST_STATE_DOWN) {
|
|
|
|
if (ast_pbx_start(tmp)) {
|
2012-01-09 22:15:50 +00:00
|
|
|
ast_log(LOG_WARNING, "Unable to start PBX on %s\n", ast_channel_name(tmp));
|
2006-09-08 03:46:33 +00:00
|
|
|
ast_hangup(tmp);
|
|
|
|
tmp = NULL;
|
2002-02-19 20:14:14 +00:00
|
|
|
}
|
|
|
|
}
|
2006-09-08 03:46:33 +00:00
|
|
|
|
2002-02-19 20:14:14 +00:00
|
|
|
return tmp;
|
|
|
|
}
|
|
|
|
|
uniqueid: channel linkedid, ami, ari object creation with id's
Much needed was a way to assign id to objects on creation, and
much change was necessary to accomplish it. Channel uniqueids
and linkedids are split into separate string and creation time
components without breaking linkedid propgation. This allowed
the uniqueid to be specified by the user interface - and those
values are now carried through to channel creation, adding the
assignedids value to every function in the chain including the
channel drivers. For local channels, the second channel can be
specified or left to default to a ;2 suffix of first. In ARI,
bridge, playback, and snoop objects can also be created with a
specified uniqueid.
Along the way, the args order to allocating channels was fixed
in chan_mgcp and chan_gtalk, and linkedid is no longer lost as
masquerade occurs.
(closes issue ASTERISK-23120)
Review: https://reviewboard.asterisk.org/r/3191/
........
Merged revisions 410157 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-03-07 15:47:55 +00:00
|
|
|
static struct ast_channel *alsa_request(const char *type, struct ast_format_cap *cap, const struct ast_assigned_ids *assignedids, const struct ast_channel *requestor, const char *data, int *cause)
|
2002-02-19 20:14:14 +00:00
|
|
|
{
|
2006-09-08 03:46:33 +00:00
|
|
|
struct ast_channel *tmp = NULL;
|
|
|
|
|
media formats: re-architect handling of media for performance improvements
In the old times media formats were represented using a bit field. This was
fast but had a few limitations.
1. Asterisk was limited in how many formats it could handle.
2. Formats, being a bit field, could not include any attribute information.
A format was strictly its type, e.g., "this is ulaw".
This was changed in Asterisk 10 (see
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal for
notes on that work) which led to the creation of the ast_format structure.
This structure allowed Asterisk to handle attributes and bundle information
with a format.
Additionally, ast_format_cap was created to act as a container for multiple
formats that, together, formed the capability of some entity. Another
mechanism was added to allow logic to be registered which performed format
attribute negotiation. Everywhere throughout the codebase Asterisk was
changed to use this strategy.
Unfortunately, in software, there is no free lunch. These new capabilities
came at a cost.
Performance analysis and profiling showed that we spend an inordinate
amount of time comparing, copying, and generally manipulating formats and
their related structures. Basic prototyping has shown that a reasonably
large performance improvement could be made in this area. This patch is the
result of that project, which overhauled the media format architecture
and its usage in Asterisk to improve performance.
Generally, the new philosophy for handling formats is as follows:
* The ast_format structure is reference counted. This removed a large amount
of the memory allocations and copying that was done in prior versions.
* In order to prevent race conditions while keeping things performant, the
ast_format structure is immutable by convention and lock-free. Violate this
tenet at your peril!
* Because formats are reference counted, codecs are also reference counted.
The Asterisk core generally provides built-in codecs and caches the
ast_format structures created to represent them. Generally, to prevent
inordinate amounts of module reference bumping, codecs and formats can be
added at run-time but cannot be removed.
* All compatibility with the bit field representation of codecs/formats has
been moved to a compatibility API. The primary user of this representation
is chan_iax2, which must continue to maintain its bit-field usage of formats
for interoperability concerns.
* When a format is negotiated with attributes, or when a format cannot be
represented by one of the cached formats, a new format object is created or
cloned from an existing format. That format may have the same codec
underlying it, but is a different format than a version of the format with
different attributes or without attributes.
* While formats are reference counted objects, the reference count maintained
on the format should be manipulated with care. Formats are generally cached
and will persist for the lifetime of Asterisk and do not explicitly need
to have their lifetime modified. An exception to this is when the user of a
format does not know where the format came from *and* the user may outlive
the provider of the format. This occurs, for example, when a format is read
from a channel: the channel may have a format with attributes (hence,
non-cached) and the user of the format may last longer than the channel (if
the reference to the channel is released prior to the format's reference).
For more information on this work, see the API design notes:
https://wiki.asterisk.org/wiki/display/AST/Media+Format+Rewrite
Finally, this work was the culmination of a large number of developer's
efforts. Extra thanks goes to Corey Farrell, who took on a large amount of the
work in the Asterisk core, chan_sip, and was an invaluable resource in peer
reviews throughout this project.
There were a substantial number of patches contributed during this work; the
following issues/patch names simply reflect some of the work (and will cause
the release scripts to give attribution to the individuals who work on them).
Reviews:
https://reviewboard.asterisk.org/r/3814
https://reviewboard.asterisk.org/r/3808
https://reviewboard.asterisk.org/r/3805
https://reviewboard.asterisk.org/r/3803
https://reviewboard.asterisk.org/r/3801
https://reviewboard.asterisk.org/r/3798
https://reviewboard.asterisk.org/r/3800
https://reviewboard.asterisk.org/r/3794
https://reviewboard.asterisk.org/r/3793
https://reviewboard.asterisk.org/r/3792
https://reviewboard.asterisk.org/r/3791
https://reviewboard.asterisk.org/r/3790
https://reviewboard.asterisk.org/r/3789
https://reviewboard.asterisk.org/r/3788
https://reviewboard.asterisk.org/r/3787
https://reviewboard.asterisk.org/r/3786
https://reviewboard.asterisk.org/r/3784
https://reviewboard.asterisk.org/r/3783
https://reviewboard.asterisk.org/r/3778
https://reviewboard.asterisk.org/r/3774
https://reviewboard.asterisk.org/r/3775
https://reviewboard.asterisk.org/r/3772
https://reviewboard.asterisk.org/r/3761
https://reviewboard.asterisk.org/r/3754
https://reviewboard.asterisk.org/r/3753
https://reviewboard.asterisk.org/r/3751
https://reviewboard.asterisk.org/r/3750
https://reviewboard.asterisk.org/r/3748
https://reviewboard.asterisk.org/r/3747
https://reviewboard.asterisk.org/r/3746
https://reviewboard.asterisk.org/r/3742
https://reviewboard.asterisk.org/r/3740
https://reviewboard.asterisk.org/r/3739
https://reviewboard.asterisk.org/r/3738
https://reviewboard.asterisk.org/r/3737
https://reviewboard.asterisk.org/r/3736
https://reviewboard.asterisk.org/r/3734
https://reviewboard.asterisk.org/r/3722
https://reviewboard.asterisk.org/r/3713
https://reviewboard.asterisk.org/r/3703
https://reviewboard.asterisk.org/r/3689
https://reviewboard.asterisk.org/r/3687
https://reviewboard.asterisk.org/r/3674
https://reviewboard.asterisk.org/r/3671
https://reviewboard.asterisk.org/r/3667
https://reviewboard.asterisk.org/r/3665
https://reviewboard.asterisk.org/r/3625
https://reviewboard.asterisk.org/r/3602
https://reviewboard.asterisk.org/r/3519
https://reviewboard.asterisk.org/r/3518
https://reviewboard.asterisk.org/r/3516
https://reviewboard.asterisk.org/r/3515
https://reviewboard.asterisk.org/r/3512
https://reviewboard.asterisk.org/r/3506
https://reviewboard.asterisk.org/r/3413
https://reviewboard.asterisk.org/r/3410
https://reviewboard.asterisk.org/r/3387
https://reviewboard.asterisk.org/r/3388
https://reviewboard.asterisk.org/r/3389
https://reviewboard.asterisk.org/r/3390
https://reviewboard.asterisk.org/r/3321
https://reviewboard.asterisk.org/r/3320
https://reviewboard.asterisk.org/r/3319
https://reviewboard.asterisk.org/r/3318
https://reviewboard.asterisk.org/r/3266
https://reviewboard.asterisk.org/r/3265
https://reviewboard.asterisk.org/r/3234
https://reviewboard.asterisk.org/r/3178
ASTERISK-23114 #close
Reported by: mjordan
media_formats_translation_core.diff uploaded by kharwell (License 6464)
rb3506.diff uploaded by mjordan (License 6283)
media_format_app_file.diff uploaded by kharwell (License 6464)
misc-2.diff uploaded by file (License 5000)
chan_mild-3.diff uploaded by file (License 5000)
chan_obscure.diff uploaded by file (License 5000)
jingle.diff uploaded by file (License 5000)
funcs.diff uploaded by file (License 5000)
formats.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
bridges.diff uploaded by file (License 5000)
mf-codecs-2.diff uploaded by file (License 5000)
mf-app_fax.diff uploaded by file (License 5000)
mf-apps-3.diff uploaded by file (License 5000)
media-formats-3.diff uploaded by file (License 5000)
ASTERISK-23715
rb3713.patch uploaded by coreyfarrell (License 5909)
rb3689.patch uploaded by mjordan (License 6283)
ASTERISK-23957
rb3722.patch uploaded by mjordan (License 6283)
mf-attributes-3.diff uploaded by file (License 5000)
ASTERISK-23958
Tested by: jrose
rb3822.patch uploaded by coreyfarrell (License 5909)
rb3800.patch uploaded by jrose (License 6182)
chan_sip.diff uploaded by mjordan (License 6283)
rb3747.patch uploaded by jrose (License 6182)
ASTERISK-23959 #close
Tested by: sgriepentrog, mjordan, coreyfarrell
sip_cleanup.diff uploaded by opticron (License 6273)
chan_sip_caps.diff uploaded by mjordan (License 6283)
rb3751.patch uploaded by coreyfarrell (License 5909)
chan_sip-3.diff uploaded by file (License 5000)
ASTERISK-23960 #close
Tested by: opticron
direct_media.diff uploaded by opticron (License 6273)
pjsip-direct-media.diff uploaded by file (License 5000)
format_cap_remove.diff uploaded by opticron (License 6273)
media_format_fixes.diff uploaded by opticron (License 6273)
chan_pjsip-2.diff uploaded by file (License 5000)
ASTERISK-23966 #close
Tested by: rmudgett
rb3803.patch uploaded by rmudgetti (License 5621)
chan_dahdi.diff uploaded by file (License 5000)
ASTERISK-24064 #close
Tested by: coreyfarrell, mjordan, opticron, file, rmudgett, sgriepentrog, jrose
rb3814.patch uploaded by rmudgett (License 5621)
moh_cleanup.diff uploaded by opticron (License 6273)
bridge_leak.diff uploaded by opticron (License 6273)
translate.diff uploaded by file (License 5000)
rb3795.patch uploaded by rmudgett (License 5621)
tls_fix.diff uploaded by mjordan (License 6283)
fax-mf-fix-2.diff uploaded by file (License 5000)
rtp_transfer_stuff uploaded by mjordan (License 6283)
rb3787.patch uploaded by rmudgett (License 5621)
media-formats-explicit-translate-format-3.diff uploaded by file (License 5000)
format_cache_case_fix.diff uploaded by opticron (License 6273)
rb3774.patch uploaded by rmudgett (License 5621)
rb3775.patch uploaded by rmudgett (License 5621)
rtp_engine_fix.diff uploaded by opticron (License 6273)
rtp_crash_fix.diff uploaded by opticron (License 6273)
rb3753.patch uploaded by mjordan (License 6283)
rb3750.patch uploaded by mjordan (License 6283)
rb3748.patch uploaded by rmudgett (License 5621)
media_format_fixes.diff uploaded by opticron (License 6273)
rb3740.patch uploaded by mjordan (License 6283)
rb3739.patch uploaded by mjordan (License 6283)
rb3734.patch uploaded by mjordan (License 6283)
rb3689.patch uploaded by mjordan (License 6283)
rb3674.patch uploaded by coreyfarrell (License 5909)
rb3671.patch uploaded by coreyfarrell (License 5909)
rb3667.patch uploaded by coreyfarrell (License 5909)
rb3665.patch uploaded by mjordan (License 6283)
rb3625.patch uploaded by coreyfarrell (License 5909)
rb3602.patch uploaded by coreyfarrell (License 5909)
format_compatibility-2.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-07-20 22:06:33 +00:00
|
|
|
if (ast_format_cap_iscompatible_format(cap, ast_format_slin) == AST_FORMAT_CMP_NOT_EQUAL) {
|
2015-11-09 09:01:41 +00:00
|
|
|
struct ast_str *codec_buf = ast_str_alloca(AST_FORMAT_CAP_NAMES_LEN);
|
media formats: re-architect handling of media for performance improvements
In the old times media formats were represented using a bit field. This was
fast but had a few limitations.
1. Asterisk was limited in how many formats it could handle.
2. Formats, being a bit field, could not include any attribute information.
A format was strictly its type, e.g., "this is ulaw".
This was changed in Asterisk 10 (see
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal for
notes on that work) which led to the creation of the ast_format structure.
This structure allowed Asterisk to handle attributes and bundle information
with a format.
Additionally, ast_format_cap was created to act as a container for multiple
formats that, together, formed the capability of some entity. Another
mechanism was added to allow logic to be registered which performed format
attribute negotiation. Everywhere throughout the codebase Asterisk was
changed to use this strategy.
Unfortunately, in software, there is no free lunch. These new capabilities
came at a cost.
Performance analysis and profiling showed that we spend an inordinate
amount of time comparing, copying, and generally manipulating formats and
their related structures. Basic prototyping has shown that a reasonably
large performance improvement could be made in this area. This patch is the
result of that project, which overhauled the media format architecture
and its usage in Asterisk to improve performance.
Generally, the new philosophy for handling formats is as follows:
* The ast_format structure is reference counted. This removed a large amount
of the memory allocations and copying that was done in prior versions.
* In order to prevent race conditions while keeping things performant, the
ast_format structure is immutable by convention and lock-free. Violate this
tenet at your peril!
* Because formats are reference counted, codecs are also reference counted.
The Asterisk core generally provides built-in codecs and caches the
ast_format structures created to represent them. Generally, to prevent
inordinate amounts of module reference bumping, codecs and formats can be
added at run-time but cannot be removed.
* All compatibility with the bit field representation of codecs/formats has
been moved to a compatibility API. The primary user of this representation
is chan_iax2, which must continue to maintain its bit-field usage of formats
for interoperability concerns.
* When a format is negotiated with attributes, or when a format cannot be
represented by one of the cached formats, a new format object is created or
cloned from an existing format. That format may have the same codec
underlying it, but is a different format than a version of the format with
different attributes or without attributes.
* While formats are reference counted objects, the reference count maintained
on the format should be manipulated with care. Formats are generally cached
and will persist for the lifetime of Asterisk and do not explicitly need
to have their lifetime modified. An exception to this is when the user of a
format does not know where the format came from *and* the user may outlive
the provider of the format. This occurs, for example, when a format is read
from a channel: the channel may have a format with attributes (hence,
non-cached) and the user of the format may last longer than the channel (if
the reference to the channel is released prior to the format's reference).
For more information on this work, see the API design notes:
https://wiki.asterisk.org/wiki/display/AST/Media+Format+Rewrite
Finally, this work was the culmination of a large number of developer's
efforts. Extra thanks goes to Corey Farrell, who took on a large amount of the
work in the Asterisk core, chan_sip, and was an invaluable resource in peer
reviews throughout this project.
There were a substantial number of patches contributed during this work; the
following issues/patch names simply reflect some of the work (and will cause
the release scripts to give attribution to the individuals who work on them).
Reviews:
https://reviewboard.asterisk.org/r/3814
https://reviewboard.asterisk.org/r/3808
https://reviewboard.asterisk.org/r/3805
https://reviewboard.asterisk.org/r/3803
https://reviewboard.asterisk.org/r/3801
https://reviewboard.asterisk.org/r/3798
https://reviewboard.asterisk.org/r/3800
https://reviewboard.asterisk.org/r/3794
https://reviewboard.asterisk.org/r/3793
https://reviewboard.asterisk.org/r/3792
https://reviewboard.asterisk.org/r/3791
https://reviewboard.asterisk.org/r/3790
https://reviewboard.asterisk.org/r/3789
https://reviewboard.asterisk.org/r/3788
https://reviewboard.asterisk.org/r/3787
https://reviewboard.asterisk.org/r/3786
https://reviewboard.asterisk.org/r/3784
https://reviewboard.asterisk.org/r/3783
https://reviewboard.asterisk.org/r/3778
https://reviewboard.asterisk.org/r/3774
https://reviewboard.asterisk.org/r/3775
https://reviewboard.asterisk.org/r/3772
https://reviewboard.asterisk.org/r/3761
https://reviewboard.asterisk.org/r/3754
https://reviewboard.asterisk.org/r/3753
https://reviewboard.asterisk.org/r/3751
https://reviewboard.asterisk.org/r/3750
https://reviewboard.asterisk.org/r/3748
https://reviewboard.asterisk.org/r/3747
https://reviewboard.asterisk.org/r/3746
https://reviewboard.asterisk.org/r/3742
https://reviewboard.asterisk.org/r/3740
https://reviewboard.asterisk.org/r/3739
https://reviewboard.asterisk.org/r/3738
https://reviewboard.asterisk.org/r/3737
https://reviewboard.asterisk.org/r/3736
https://reviewboard.asterisk.org/r/3734
https://reviewboard.asterisk.org/r/3722
https://reviewboard.asterisk.org/r/3713
https://reviewboard.asterisk.org/r/3703
https://reviewboard.asterisk.org/r/3689
https://reviewboard.asterisk.org/r/3687
https://reviewboard.asterisk.org/r/3674
https://reviewboard.asterisk.org/r/3671
https://reviewboard.asterisk.org/r/3667
https://reviewboard.asterisk.org/r/3665
https://reviewboard.asterisk.org/r/3625
https://reviewboard.asterisk.org/r/3602
https://reviewboard.asterisk.org/r/3519
https://reviewboard.asterisk.org/r/3518
https://reviewboard.asterisk.org/r/3516
https://reviewboard.asterisk.org/r/3515
https://reviewboard.asterisk.org/r/3512
https://reviewboard.asterisk.org/r/3506
https://reviewboard.asterisk.org/r/3413
https://reviewboard.asterisk.org/r/3410
https://reviewboard.asterisk.org/r/3387
https://reviewboard.asterisk.org/r/3388
https://reviewboard.asterisk.org/r/3389
https://reviewboard.asterisk.org/r/3390
https://reviewboard.asterisk.org/r/3321
https://reviewboard.asterisk.org/r/3320
https://reviewboard.asterisk.org/r/3319
https://reviewboard.asterisk.org/r/3318
https://reviewboard.asterisk.org/r/3266
https://reviewboard.asterisk.org/r/3265
https://reviewboard.asterisk.org/r/3234
https://reviewboard.asterisk.org/r/3178
ASTERISK-23114 #close
Reported by: mjordan
media_formats_translation_core.diff uploaded by kharwell (License 6464)
rb3506.diff uploaded by mjordan (License 6283)
media_format_app_file.diff uploaded by kharwell (License 6464)
misc-2.diff uploaded by file (License 5000)
chan_mild-3.diff uploaded by file (License 5000)
chan_obscure.diff uploaded by file (License 5000)
jingle.diff uploaded by file (License 5000)
funcs.diff uploaded by file (License 5000)
formats.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
bridges.diff uploaded by file (License 5000)
mf-codecs-2.diff uploaded by file (License 5000)
mf-app_fax.diff uploaded by file (License 5000)
mf-apps-3.diff uploaded by file (License 5000)
media-formats-3.diff uploaded by file (License 5000)
ASTERISK-23715
rb3713.patch uploaded by coreyfarrell (License 5909)
rb3689.patch uploaded by mjordan (License 6283)
ASTERISK-23957
rb3722.patch uploaded by mjordan (License 6283)
mf-attributes-3.diff uploaded by file (License 5000)
ASTERISK-23958
Tested by: jrose
rb3822.patch uploaded by coreyfarrell (License 5909)
rb3800.patch uploaded by jrose (License 6182)
chan_sip.diff uploaded by mjordan (License 6283)
rb3747.patch uploaded by jrose (License 6182)
ASTERISK-23959 #close
Tested by: sgriepentrog, mjordan, coreyfarrell
sip_cleanup.diff uploaded by opticron (License 6273)
chan_sip_caps.diff uploaded by mjordan (License 6283)
rb3751.patch uploaded by coreyfarrell (License 5909)
chan_sip-3.diff uploaded by file (License 5000)
ASTERISK-23960 #close
Tested by: opticron
direct_media.diff uploaded by opticron (License 6273)
pjsip-direct-media.diff uploaded by file (License 5000)
format_cap_remove.diff uploaded by opticron (License 6273)
media_format_fixes.diff uploaded by opticron (License 6273)
chan_pjsip-2.diff uploaded by file (License 5000)
ASTERISK-23966 #close
Tested by: rmudgett
rb3803.patch uploaded by rmudgetti (License 5621)
chan_dahdi.diff uploaded by file (License 5000)
ASTERISK-24064 #close
Tested by: coreyfarrell, mjordan, opticron, file, rmudgett, sgriepentrog, jrose
rb3814.patch uploaded by rmudgett (License 5621)
moh_cleanup.diff uploaded by opticron (License 6273)
bridge_leak.diff uploaded by opticron (License 6273)
translate.diff uploaded by file (License 5000)
rb3795.patch uploaded by rmudgett (License 5621)
tls_fix.diff uploaded by mjordan (License 6283)
fax-mf-fix-2.diff uploaded by file (License 5000)
rtp_transfer_stuff uploaded by mjordan (License 6283)
rb3787.patch uploaded by rmudgett (License 5621)
media-formats-explicit-translate-format-3.diff uploaded by file (License 5000)
format_cache_case_fix.diff uploaded by opticron (License 6273)
rb3774.patch uploaded by rmudgett (License 5621)
rb3775.patch uploaded by rmudgett (License 5621)
rtp_engine_fix.diff uploaded by opticron (License 6273)
rtp_crash_fix.diff uploaded by opticron (License 6273)
rb3753.patch uploaded by mjordan (License 6283)
rb3750.patch uploaded by mjordan (License 6283)
rb3748.patch uploaded by rmudgett (License 5621)
media_format_fixes.diff uploaded by opticron (License 6273)
rb3740.patch uploaded by mjordan (License 6283)
rb3739.patch uploaded by mjordan (License 6283)
rb3734.patch uploaded by mjordan (License 6283)
rb3689.patch uploaded by mjordan (License 6283)
rb3674.patch uploaded by coreyfarrell (License 5909)
rb3671.patch uploaded by coreyfarrell (License 5909)
rb3667.patch uploaded by coreyfarrell (License 5909)
rb3665.patch uploaded by mjordan (License 6283)
rb3625.patch uploaded by coreyfarrell (License 5909)
rb3602.patch uploaded by coreyfarrell (License 5909)
format_compatibility-2.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-07-20 22:06:33 +00:00
|
|
|
ast_log(LOG_NOTICE, "Asked to get a channel of format '%s'\n", ast_format_cap_get_names(cap, &codec_buf));
|
2002-02-19 20:14:14 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
2006-09-08 03:46:33 +00:00
|
|
|
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_mutex_lock(&alsalock);
|
2006-09-08 03:46:33 +00:00
|
|
|
|
2002-02-19 20:14:14 +00:00
|
|
|
if (alsa.owner) {
|
|
|
|
ast_log(LOG_NOTICE, "Already have a call on the ALSA channel\n");
|
2004-10-26 22:25:43 +00:00
|
|
|
*cause = AST_CAUSE_BUSY;
|
uniqueid: channel linkedid, ami, ari object creation with id's
Much needed was a way to assign id to objects on creation, and
much change was necessary to accomplish it. Channel uniqueids
and linkedids are split into separate string and creation time
components without breaking linkedid propgation. This allowed
the uniqueid to be specified by the user interface - and those
values are now carried through to channel creation, adding the
assignedids value to every function in the chain including the
channel drivers. For local channels, the second channel can be
specified or left to default to a ;2 suffix of first. In ARI,
bridge, playback, and snoop objects can also be created with a
specified uniqueid.
Along the way, the args order to allocating channels was fixed
in chan_mgcp and chan_gtalk, and linkedid is no longer lost as
masquerade occurs.
(closes issue ASTERISK-23120)
Review: https://reviewboard.asterisk.org/r/3191/
........
Merged revisions 410157 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-03-07 15:47:55 +00:00
|
|
|
} else if (!(tmp = alsa_new(&alsa, AST_STATE_DOWN, assignedids, requestor))) {
|
2006-09-08 03:46:33 +00:00
|
|
|
ast_log(LOG_WARNING, "Unable to create new ALSA channel\n");
|
2008-01-03 18:10:13 +00:00
|
|
|
}
|
2006-09-08 03:46:33 +00:00
|
|
|
|
2004-06-26 05:20:42 +00:00
|
|
|
ast_mutex_unlock(&alsalock);
|
2006-09-08 03:46:33 +00:00
|
|
|
|
2002-02-19 20:14:14 +00:00
|
|
|
return tmp;
|
|
|
|
}
|
|
|
|
|
2007-09-18 22:43:45 +00:00
|
|
|
static char *console_autoanswer(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
|
|
|
|
{
|
|
|
|
char *res = CLI_SUCCESS;
|
|
|
|
|
|
|
|
switch (cmd) {
|
|
|
|
case CLI_INIT:
|
2017-02-11 15:57:03 +00:00
|
|
|
e->command = "console autoanswer [on|off]";
|
2007-09-18 22:43:45 +00:00
|
|
|
e->usage =
|
|
|
|
"Usage: console autoanswer [on|off]\n"
|
|
|
|
" Enables or disables autoanswer feature. If used without\n"
|
|
|
|
" argument, displays the current on/off status of autoanswer.\n"
|
|
|
|
" The default value of autoanswer is in 'alsa.conf'.\n";
|
|
|
|
return NULL;
|
|
|
|
case CLI_GENERATE:
|
2017-02-11 15:57:03 +00:00
|
|
|
return NULL;
|
2007-09-18 22:43:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if ((a->argc != 2) && (a->argc != 3))
|
|
|
|
return CLI_SHOWUSAGE;
|
2008-01-03 18:10:13 +00:00
|
|
|
|
2007-09-18 22:43:45 +00:00
|
|
|
ast_mutex_lock(&alsalock);
|
|
|
|
if (a->argc == 2) {
|
|
|
|
ast_cli(a->fd, "Auto answer is %s.\n", autoanswer ? "on" : "off");
|
|
|
|
} else {
|
|
|
|
if (!strcasecmp(a->argv[2], "on"))
|
|
|
|
autoanswer = -1;
|
|
|
|
else if (!strcasecmp(a->argv[2], "off"))
|
|
|
|
autoanswer = 0;
|
|
|
|
else
|
|
|
|
res = CLI_SHOWUSAGE;
|
|
|
|
}
|
|
|
|
ast_mutex_unlock(&alsalock);
|
2008-01-03 18:10:13 +00:00
|
|
|
|
2007-09-18 22:43:45 +00:00
|
|
|
return res;
|
|
|
|
}
|
2002-02-19 20:14:14 +00:00
|
|
|
|
2007-09-18 22:43:45 +00:00
|
|
|
static char *console_answer(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
|
2006-09-18 19:54:18 +00:00
|
|
|
{
|
2007-09-18 22:43:45 +00:00
|
|
|
char *res = CLI_SUCCESS;
|
|
|
|
|
|
|
|
switch (cmd) {
|
|
|
|
case CLI_INIT:
|
|
|
|
e->command = "console answer";
|
|
|
|
e->usage =
|
|
|
|
"Usage: console answer\n"
|
|
|
|
" Answers an incoming call on the console (ALSA) channel.\n";
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
case CLI_GENERATE:
|
|
|
|
return NULL;
|
|
|
|
}
|
2002-02-19 20:14:14 +00:00
|
|
|
|
2007-09-18 22:43:45 +00:00
|
|
|
if (a->argc != 2)
|
|
|
|
return CLI_SHOWUSAGE;
|
2006-09-18 19:54:18 +00:00
|
|
|
|
|
|
|
ast_mutex_lock(&alsalock);
|
|
|
|
|
|
|
|
if (!alsa.owner) {
|
2007-09-18 22:43:45 +00:00
|
|
|
ast_cli(a->fd, "No one is calling us\n");
|
|
|
|
res = CLI_FAILURE;
|
2006-09-18 19:54:18 +00:00
|
|
|
} else {
|
2009-11-12 23:37:36 +00:00
|
|
|
if (mute) {
|
|
|
|
ast_verbose( " << Muted >> \n" );
|
|
|
|
}
|
2006-09-18 19:54:18 +00:00
|
|
|
hookstate = 1;
|
|
|
|
grab_owner();
|
|
|
|
if (alsa.owner) {
|
2009-11-04 14:05:12 +00:00
|
|
|
ast_queue_control(alsa.owner, AST_CONTROL_ANSWER);
|
2007-09-17 22:59:36 +00:00
|
|
|
ast_channel_unlock(alsa.owner);
|
2006-09-18 19:54:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-11-12 23:37:36 +00:00
|
|
|
if (!noaudiocapture) {
|
|
|
|
snd_pcm_prepare(alsa.icard);
|
|
|
|
snd_pcm_start(alsa.icard);
|
|
|
|
}
|
2006-09-18 19:54:18 +00:00
|
|
|
|
|
|
|
ast_mutex_unlock(&alsalock);
|
|
|
|
|
2007-09-18 22:43:45 +00:00
|
|
|
return res;
|
2006-09-18 19:54:18 +00:00
|
|
|
}
|
|
|
|
|
2007-09-18 22:43:45 +00:00
|
|
|
static char *console_sendtext(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
|
2006-09-18 19:54:18 +00:00
|
|
|
{
|
|
|
|
int tmparg = 3;
|
2007-09-18 22:43:45 +00:00
|
|
|
char *res = CLI_SUCCESS;
|
|
|
|
|
|
|
|
switch (cmd) {
|
|
|
|
case CLI_INIT:
|
|
|
|
e->command = "console send text";
|
|
|
|
e->usage =
|
|
|
|
"Usage: console send text <message>\n"
|
|
|
|
" Sends a text message for display on the remote terminal.\n";
|
|
|
|
return NULL;
|
|
|
|
case CLI_GENERATE:
|
|
|
|
return NULL;
|
|
|
|
}
|
2002-02-19 20:14:14 +00:00
|
|
|
|
2007-09-18 22:43:45 +00:00
|
|
|
if (a->argc < 3)
|
|
|
|
return CLI_SHOWUSAGE;
|
2006-09-18 19:54:18 +00:00
|
|
|
|
|
|
|
ast_mutex_lock(&alsalock);
|
|
|
|
|
|
|
|
if (!alsa.owner) {
|
2008-01-03 18:10:13 +00:00
|
|
|
ast_cli(a->fd, "No channel active\n");
|
2007-09-18 22:43:45 +00:00
|
|
|
res = CLI_FAILURE;
|
2006-09-18 19:54:18 +00:00
|
|
|
} else {
|
2009-11-04 14:05:12 +00:00
|
|
|
struct ast_frame f = { AST_FRAME_TEXT };
|
2006-09-18 19:54:18 +00:00
|
|
|
char text2send[256] = "";
|
2008-01-03 18:10:13 +00:00
|
|
|
|
2007-09-18 22:43:45 +00:00
|
|
|
while (tmparg < a->argc) {
|
|
|
|
strncat(text2send, a->argv[tmparg++], sizeof(text2send) - strlen(text2send) - 1);
|
2006-09-18 19:54:18 +00:00
|
|
|
strncat(text2send, " ", sizeof(text2send) - strlen(text2send) - 1);
|
|
|
|
}
|
2008-01-03 18:10:13 +00:00
|
|
|
|
2006-09-18 19:54:18 +00:00
|
|
|
text2send[strlen(text2send) - 1] = '\n';
|
2008-05-22 16:29:54 +00:00
|
|
|
f.data.ptr = text2send;
|
2006-09-18 19:54:18 +00:00
|
|
|
f.datalen = strlen(text2send) + 1;
|
|
|
|
grab_owner();
|
|
|
|
if (alsa.owner) {
|
|
|
|
ast_queue_frame(alsa.owner, &f);
|
2009-11-04 14:05:12 +00:00
|
|
|
ast_queue_control(alsa.owner, AST_CONTROL_ANSWER);
|
2007-09-17 22:59:36 +00:00
|
|
|
ast_channel_unlock(alsa.owner);
|
2006-09-18 19:54:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ast_mutex_unlock(&alsalock);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2007-09-18 22:43:45 +00:00
|
|
|
static char *console_hangup(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
|
2006-09-18 19:54:18 +00:00
|
|
|
{
|
2007-09-18 22:43:45 +00:00
|
|
|
char *res = CLI_SUCCESS;
|
|
|
|
|
|
|
|
switch (cmd) {
|
|
|
|
case CLI_INIT:
|
|
|
|
e->command = "console hangup";
|
|
|
|
e->usage =
|
|
|
|
"Usage: console hangup\n"
|
|
|
|
" Hangs up any call currently placed on the console.\n";
|
|
|
|
return NULL;
|
|
|
|
case CLI_GENERATE:
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2002-02-19 20:14:14 +00:00
|
|
|
|
2007-09-18 22:43:45 +00:00
|
|
|
if (a->argc != 2)
|
|
|
|
return CLI_SHOWUSAGE;
|
2002-02-19 20:14:14 +00:00
|
|
|
|
2006-09-18 19:54:18 +00:00
|
|
|
ast_mutex_lock(&alsalock);
|
|
|
|
|
|
|
|
if (!alsa.owner && !hookstate) {
|
2008-01-03 18:10:13 +00:00
|
|
|
ast_cli(a->fd, "No call to hangup\n");
|
2007-09-18 22:43:45 +00:00
|
|
|
res = CLI_FAILURE;
|
2006-09-18 19:54:18 +00:00
|
|
|
} else {
|
|
|
|
hookstate = 0;
|
|
|
|
grab_owner();
|
|
|
|
if (alsa.owner) {
|
2008-05-22 16:29:54 +00:00
|
|
|
ast_queue_hangup_with_cause(alsa.owner, AST_CAUSE_NORMAL_CLEARING);
|
2007-09-17 22:59:36 +00:00
|
|
|
ast_channel_unlock(alsa.owner);
|
2006-09-18 19:54:18 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
ast_mutex_unlock(&alsalock);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2007-09-18 22:43:45 +00:00
|
|
|
static char *console_dial(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
|
2006-09-18 19:54:18 +00:00
|
|
|
{
|
|
|
|
char tmp[256], *tmp2;
|
|
|
|
char *mye, *myc;
|
2009-05-21 21:13:09 +00:00
|
|
|
const char *d;
|
2007-09-18 22:43:45 +00:00
|
|
|
char *res = CLI_SUCCESS;
|
|
|
|
|
|
|
|
switch (cmd) {
|
|
|
|
case CLI_INIT:
|
|
|
|
e->command = "console dial";
|
|
|
|
e->usage =
|
|
|
|
"Usage: console dial [extension[@context]]\n"
|
|
|
|
" Dials a given extension (and context if specified)\n";
|
|
|
|
return NULL;
|
|
|
|
case CLI_GENERATE:
|
|
|
|
return NULL;
|
|
|
|
}
|
2006-09-18 19:54:18 +00:00
|
|
|
|
2007-09-18 22:43:45 +00:00
|
|
|
if ((a->argc != 2) && (a->argc != 3))
|
|
|
|
return CLI_SHOWUSAGE;
|
2002-02-19 20:14:14 +00:00
|
|
|
|
2006-09-18 19:54:18 +00:00
|
|
|
ast_mutex_lock(&alsalock);
|
2002-02-19 20:14:14 +00:00
|
|
|
|
2006-09-18 19:54:18 +00:00
|
|
|
if (alsa.owner) {
|
2007-09-18 22:43:45 +00:00
|
|
|
if (a->argc == 3) {
|
2006-09-18 19:54:18 +00:00
|
|
|
if (alsa.owner) {
|
2008-01-03 18:10:13 +00:00
|
|
|
for (d = a->argv[2]; *d; d++) {
|
2009-11-04 14:05:12 +00:00
|
|
|
struct ast_frame f = { .frametype = AST_FRAME_DTMF, .subclass.integer = *d };
|
2008-01-03 18:10:13 +00:00
|
|
|
|
2006-09-18 19:54:18 +00:00
|
|
|
ast_queue_frame(alsa.owner, &f);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else {
|
2007-09-18 22:43:45 +00:00
|
|
|
ast_cli(a->fd, "You're already in a call. You can use this only to dial digits until you hangup\n");
|
|
|
|
res = CLI_FAILURE;
|
2006-09-18 19:54:18 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
mye = exten;
|
|
|
|
myc = context;
|
2007-09-18 22:43:45 +00:00
|
|
|
if (a->argc == 3) {
|
2006-09-18 19:54:18 +00:00
|
|
|
char *stringp = NULL;
|
2008-01-03 18:10:13 +00:00
|
|
|
|
2007-09-18 22:43:45 +00:00
|
|
|
ast_copy_string(tmp, a->argv[2], sizeof(tmp));
|
2006-09-18 19:54:18 +00:00
|
|
|
stringp = tmp;
|
|
|
|
strsep(&stringp, "@");
|
|
|
|
tmp2 = strsep(&stringp, "@");
|
|
|
|
if (!ast_strlen_zero(tmp))
|
|
|
|
mye = tmp;
|
|
|
|
if (!ast_strlen_zero(tmp2))
|
|
|
|
myc = tmp2;
|
|
|
|
}
|
|
|
|
if (ast_exists_extension(NULL, myc, mye, 1, NULL)) {
|
2006-10-25 14:44:50 +00:00
|
|
|
ast_copy_string(alsa.exten, mye, sizeof(alsa.exten));
|
|
|
|
ast_copy_string(alsa.context, myc, sizeof(alsa.context));
|
2006-09-18 19:54:18 +00:00
|
|
|
hookstate = 1;
|
uniqueid: channel linkedid, ami, ari object creation with id's
Much needed was a way to assign id to objects on creation, and
much change was necessary to accomplish it. Channel uniqueids
and linkedids are split into separate string and creation time
components without breaking linkedid propgation. This allowed
the uniqueid to be specified by the user interface - and those
values are now carried through to channel creation, adding the
assignedids value to every function in the chain including the
channel drivers. For local channels, the second channel can be
specified or left to default to a ;2 suffix of first. In ARI,
bridge, playback, and snoop objects can also be created with a
specified uniqueid.
Along the way, the args order to allocating channels was fixed
in chan_mgcp and chan_gtalk, and linkedid is no longer lost as
masquerade occurs.
(closes issue ASTERISK-23120)
Review: https://reviewboard.asterisk.org/r/3191/
........
Merged revisions 410157 from http://svn.asterisk.org/svn/asterisk/branches/12
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410158 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-03-07 15:47:55 +00:00
|
|
|
alsa_new(&alsa, AST_STATE_RINGING, NULL, NULL);
|
2006-09-18 19:54:18 +00:00
|
|
|
} else
|
2007-09-18 22:43:45 +00:00
|
|
|
ast_cli(a->fd, "No such extension '%s' in context '%s'\n", mye, myc);
|
2006-09-18 19:54:18 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
ast_mutex_unlock(&alsalock);
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2009-11-12 23:37:36 +00:00
|
|
|
static char *console_mute(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
|
|
|
|
{
|
|
|
|
int toggle = 0;
|
|
|
|
char *res = CLI_SUCCESS;
|
|
|
|
|
|
|
|
switch (cmd) {
|
|
|
|
case CLI_INIT:
|
|
|
|
e->command = "console {mute|unmute} [toggle]";
|
|
|
|
e->usage =
|
|
|
|
"Usage: console {mute|unmute} [toggle]\n"
|
|
|
|
" Mute/unmute the microphone.\n";
|
|
|
|
return NULL;
|
|
|
|
case CLI_GENERATE:
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (a->argc > 3) {
|
|
|
|
return CLI_SHOWUSAGE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (a->argc == 3) {
|
|
|
|
if (strcasecmp(a->argv[2], "toggle"))
|
|
|
|
return CLI_SHOWUSAGE;
|
|
|
|
toggle = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (a->argc < 2) {
|
|
|
|
return CLI_SHOWUSAGE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcasecmp(a->argv[1], "mute")) {
|
|
|
|
mute = toggle ? !mute : 1;
|
|
|
|
} else if (!strcasecmp(a->argv[1], "unmute")) {
|
|
|
|
mute = toggle ? !mute : 0;
|
|
|
|
} else {
|
|
|
|
return CLI_SHOWUSAGE;
|
|
|
|
}
|
|
|
|
|
|
|
|
ast_cli(a->fd, "Console mic is %s\n", mute ? "off" : "on");
|
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
2006-09-18 19:54:18 +00:00
|
|
|
static struct ast_cli_entry cli_alsa[] = {
|
2007-10-22 20:05:18 +00:00
|
|
|
AST_CLI_DEFINE(console_answer, "Answer an incoming console call"),
|
|
|
|
AST_CLI_DEFINE(console_hangup, "Hangup a call on the console"),
|
|
|
|
AST_CLI_DEFINE(console_dial, "Dial an extension on the console"),
|
|
|
|
AST_CLI_DEFINE(console_sendtext, "Send text to the remote device"),
|
|
|
|
AST_CLI_DEFINE(console_autoanswer, "Sets/displays autoanswer"),
|
2009-11-12 23:37:36 +00:00
|
|
|
AST_CLI_DEFINE(console_mute, "Disable/Enable mic input"),
|
2002-02-19 20:14:14 +00:00
|
|
|
};
|
|
|
|
|
2017-04-11 16:07:39 +00:00
|
|
|
static int unload_module(void)
|
|
|
|
{
|
|
|
|
ast_channel_unregister(&alsa_tech);
|
|
|
|
ast_cli_unregister_multiple(cli_alsa, ARRAY_LEN(cli_alsa));
|
|
|
|
|
|
|
|
if (alsa.icard)
|
|
|
|
snd_pcm_close(alsa.icard);
|
|
|
|
if (alsa.ocard)
|
|
|
|
snd_pcm_close(alsa.ocard);
|
|
|
|
if (alsa.owner)
|
|
|
|
ast_softhangup(alsa.owner, AST_SOFTHANGUP_APPUNLOAD);
|
|
|
|
if (alsa.owner)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
ao2_cleanup(alsa_tech.capabilities);
|
|
|
|
alsa_tech.capabilities = NULL;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-10-01 23:24:35 +00:00
|
|
|
/*!
|
|
|
|
* \brief Load the module
|
|
|
|
*
|
|
|
|
* Module loading including tests for configuration or dependencies.
|
|
|
|
* This function can return AST_MODULE_LOAD_FAILURE, AST_MODULE_LOAD_DECLINE,
|
|
|
|
* or AST_MODULE_LOAD_SUCCESS. If a dependency or environment variable fails
|
|
|
|
* tests return AST_MODULE_LOAD_FAILURE. If the module can not load the
|
|
|
|
* configuration file or other non-critical problem return
|
|
|
|
* AST_MODULE_LOAD_DECLINE. On success return AST_MODULE_LOAD_SUCCESS.
|
|
|
|
*/
|
2006-08-21 02:11:39 +00:00
|
|
|
static int load_module(void)
|
2002-02-19 20:14:14 +00:00
|
|
|
{
|
2003-04-12 14:03:09 +00:00
|
|
|
struct ast_config *cfg;
|
2002-02-19 20:14:14 +00:00
|
|
|
struct ast_variable *v;
|
2007-08-16 21:09:46 +00:00
|
|
|
struct ast_flags config_flags = { 0 };
|
2011-02-03 16:22:10 +00:00
|
|
|
|
media formats: re-architect handling of media for performance improvements
In the old times media formats were represented using a bit field. This was
fast but had a few limitations.
1. Asterisk was limited in how many formats it could handle.
2. Formats, being a bit field, could not include any attribute information.
A format was strictly its type, e.g., "this is ulaw".
This was changed in Asterisk 10 (see
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal for
notes on that work) which led to the creation of the ast_format structure.
This structure allowed Asterisk to handle attributes and bundle information
with a format.
Additionally, ast_format_cap was created to act as a container for multiple
formats that, together, formed the capability of some entity. Another
mechanism was added to allow logic to be registered which performed format
attribute negotiation. Everywhere throughout the codebase Asterisk was
changed to use this strategy.
Unfortunately, in software, there is no free lunch. These new capabilities
came at a cost.
Performance analysis and profiling showed that we spend an inordinate
amount of time comparing, copying, and generally manipulating formats and
their related structures. Basic prototyping has shown that a reasonably
large performance improvement could be made in this area. This patch is the
result of that project, which overhauled the media format architecture
and its usage in Asterisk to improve performance.
Generally, the new philosophy for handling formats is as follows:
* The ast_format structure is reference counted. This removed a large amount
of the memory allocations and copying that was done in prior versions.
* In order to prevent race conditions while keeping things performant, the
ast_format structure is immutable by convention and lock-free. Violate this
tenet at your peril!
* Because formats are reference counted, codecs are also reference counted.
The Asterisk core generally provides built-in codecs and caches the
ast_format structures created to represent them. Generally, to prevent
inordinate amounts of module reference bumping, codecs and formats can be
added at run-time but cannot be removed.
* All compatibility with the bit field representation of codecs/formats has
been moved to a compatibility API. The primary user of this representation
is chan_iax2, which must continue to maintain its bit-field usage of formats
for interoperability concerns.
* When a format is negotiated with attributes, or when a format cannot be
represented by one of the cached formats, a new format object is created or
cloned from an existing format. That format may have the same codec
underlying it, but is a different format than a version of the format with
different attributes or without attributes.
* While formats are reference counted objects, the reference count maintained
on the format should be manipulated with care. Formats are generally cached
and will persist for the lifetime of Asterisk and do not explicitly need
to have their lifetime modified. An exception to this is when the user of a
format does not know where the format came from *and* the user may outlive
the provider of the format. This occurs, for example, when a format is read
from a channel: the channel may have a format with attributes (hence,
non-cached) and the user of the format may last longer than the channel (if
the reference to the channel is released prior to the format's reference).
For more information on this work, see the API design notes:
https://wiki.asterisk.org/wiki/display/AST/Media+Format+Rewrite
Finally, this work was the culmination of a large number of developer's
efforts. Extra thanks goes to Corey Farrell, who took on a large amount of the
work in the Asterisk core, chan_sip, and was an invaluable resource in peer
reviews throughout this project.
There were a substantial number of patches contributed during this work; the
following issues/patch names simply reflect some of the work (and will cause
the release scripts to give attribution to the individuals who work on them).
Reviews:
https://reviewboard.asterisk.org/r/3814
https://reviewboard.asterisk.org/r/3808
https://reviewboard.asterisk.org/r/3805
https://reviewboard.asterisk.org/r/3803
https://reviewboard.asterisk.org/r/3801
https://reviewboard.asterisk.org/r/3798
https://reviewboard.asterisk.org/r/3800
https://reviewboard.asterisk.org/r/3794
https://reviewboard.asterisk.org/r/3793
https://reviewboard.asterisk.org/r/3792
https://reviewboard.asterisk.org/r/3791
https://reviewboard.asterisk.org/r/3790
https://reviewboard.asterisk.org/r/3789
https://reviewboard.asterisk.org/r/3788
https://reviewboard.asterisk.org/r/3787
https://reviewboard.asterisk.org/r/3786
https://reviewboard.asterisk.org/r/3784
https://reviewboard.asterisk.org/r/3783
https://reviewboard.asterisk.org/r/3778
https://reviewboard.asterisk.org/r/3774
https://reviewboard.asterisk.org/r/3775
https://reviewboard.asterisk.org/r/3772
https://reviewboard.asterisk.org/r/3761
https://reviewboard.asterisk.org/r/3754
https://reviewboard.asterisk.org/r/3753
https://reviewboard.asterisk.org/r/3751
https://reviewboard.asterisk.org/r/3750
https://reviewboard.asterisk.org/r/3748
https://reviewboard.asterisk.org/r/3747
https://reviewboard.asterisk.org/r/3746
https://reviewboard.asterisk.org/r/3742
https://reviewboard.asterisk.org/r/3740
https://reviewboard.asterisk.org/r/3739
https://reviewboard.asterisk.org/r/3738
https://reviewboard.asterisk.org/r/3737
https://reviewboard.asterisk.org/r/3736
https://reviewboard.asterisk.org/r/3734
https://reviewboard.asterisk.org/r/3722
https://reviewboard.asterisk.org/r/3713
https://reviewboard.asterisk.org/r/3703
https://reviewboard.asterisk.org/r/3689
https://reviewboard.asterisk.org/r/3687
https://reviewboard.asterisk.org/r/3674
https://reviewboard.asterisk.org/r/3671
https://reviewboard.asterisk.org/r/3667
https://reviewboard.asterisk.org/r/3665
https://reviewboard.asterisk.org/r/3625
https://reviewboard.asterisk.org/r/3602
https://reviewboard.asterisk.org/r/3519
https://reviewboard.asterisk.org/r/3518
https://reviewboard.asterisk.org/r/3516
https://reviewboard.asterisk.org/r/3515
https://reviewboard.asterisk.org/r/3512
https://reviewboard.asterisk.org/r/3506
https://reviewboard.asterisk.org/r/3413
https://reviewboard.asterisk.org/r/3410
https://reviewboard.asterisk.org/r/3387
https://reviewboard.asterisk.org/r/3388
https://reviewboard.asterisk.org/r/3389
https://reviewboard.asterisk.org/r/3390
https://reviewboard.asterisk.org/r/3321
https://reviewboard.asterisk.org/r/3320
https://reviewboard.asterisk.org/r/3319
https://reviewboard.asterisk.org/r/3318
https://reviewboard.asterisk.org/r/3266
https://reviewboard.asterisk.org/r/3265
https://reviewboard.asterisk.org/r/3234
https://reviewboard.asterisk.org/r/3178
ASTERISK-23114 #close
Reported by: mjordan
media_formats_translation_core.diff uploaded by kharwell (License 6464)
rb3506.diff uploaded by mjordan (License 6283)
media_format_app_file.diff uploaded by kharwell (License 6464)
misc-2.diff uploaded by file (License 5000)
chan_mild-3.diff uploaded by file (License 5000)
chan_obscure.diff uploaded by file (License 5000)
jingle.diff uploaded by file (License 5000)
funcs.diff uploaded by file (License 5000)
formats.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
bridges.diff uploaded by file (License 5000)
mf-codecs-2.diff uploaded by file (License 5000)
mf-app_fax.diff uploaded by file (License 5000)
mf-apps-3.diff uploaded by file (License 5000)
media-formats-3.diff uploaded by file (License 5000)
ASTERISK-23715
rb3713.patch uploaded by coreyfarrell (License 5909)
rb3689.patch uploaded by mjordan (License 6283)
ASTERISK-23957
rb3722.patch uploaded by mjordan (License 6283)
mf-attributes-3.diff uploaded by file (License 5000)
ASTERISK-23958
Tested by: jrose
rb3822.patch uploaded by coreyfarrell (License 5909)
rb3800.patch uploaded by jrose (License 6182)
chan_sip.diff uploaded by mjordan (License 6283)
rb3747.patch uploaded by jrose (License 6182)
ASTERISK-23959 #close
Tested by: sgriepentrog, mjordan, coreyfarrell
sip_cleanup.diff uploaded by opticron (License 6273)
chan_sip_caps.diff uploaded by mjordan (License 6283)
rb3751.patch uploaded by coreyfarrell (License 5909)
chan_sip-3.diff uploaded by file (License 5000)
ASTERISK-23960 #close
Tested by: opticron
direct_media.diff uploaded by opticron (License 6273)
pjsip-direct-media.diff uploaded by file (License 5000)
format_cap_remove.diff uploaded by opticron (License 6273)
media_format_fixes.diff uploaded by opticron (License 6273)
chan_pjsip-2.diff uploaded by file (License 5000)
ASTERISK-23966 #close
Tested by: rmudgett
rb3803.patch uploaded by rmudgetti (License 5621)
chan_dahdi.diff uploaded by file (License 5000)
ASTERISK-24064 #close
Tested by: coreyfarrell, mjordan, opticron, file, rmudgett, sgriepentrog, jrose
rb3814.patch uploaded by rmudgett (License 5621)
moh_cleanup.diff uploaded by opticron (License 6273)
bridge_leak.diff uploaded by opticron (License 6273)
translate.diff uploaded by file (License 5000)
rb3795.patch uploaded by rmudgett (License 5621)
tls_fix.diff uploaded by mjordan (License 6283)
fax-mf-fix-2.diff uploaded by file (License 5000)
rtp_transfer_stuff uploaded by mjordan (License 6283)
rb3787.patch uploaded by rmudgett (License 5621)
media-formats-explicit-translate-format-3.diff uploaded by file (License 5000)
format_cache_case_fix.diff uploaded by opticron (License 6273)
rb3774.patch uploaded by rmudgett (License 5621)
rb3775.patch uploaded by rmudgett (License 5621)
rtp_engine_fix.diff uploaded by opticron (License 6273)
rtp_crash_fix.diff uploaded by opticron (License 6273)
rb3753.patch uploaded by mjordan (License 6283)
rb3750.patch uploaded by mjordan (License 6283)
rb3748.patch uploaded by rmudgett (License 5621)
media_format_fixes.diff uploaded by opticron (License 6273)
rb3740.patch uploaded by mjordan (License 6283)
rb3739.patch uploaded by mjordan (License 6283)
rb3734.patch uploaded by mjordan (License 6283)
rb3689.patch uploaded by mjordan (License 6283)
rb3674.patch uploaded by coreyfarrell (License 5909)
rb3671.patch uploaded by coreyfarrell (License 5909)
rb3667.patch uploaded by coreyfarrell (License 5909)
rb3665.patch uploaded by mjordan (License 6283)
rb3625.patch uploaded by coreyfarrell (License 5909)
rb3602.patch uploaded by coreyfarrell (License 5909)
format_compatibility-2.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-07-20 22:06:33 +00:00
|
|
|
if (!(alsa_tech.capabilities = ast_format_cap_alloc(AST_FORMAT_CAP_FLAG_DEFAULT))) {
|
2011-02-03 16:22:10 +00:00
|
|
|
return AST_MODULE_LOAD_DECLINE;
|
|
|
|
}
|
media formats: re-architect handling of media for performance improvements
In the old times media formats were represented using a bit field. This was
fast but had a few limitations.
1. Asterisk was limited in how many formats it could handle.
2. Formats, being a bit field, could not include any attribute information.
A format was strictly its type, e.g., "this is ulaw".
This was changed in Asterisk 10 (see
https://wiki.asterisk.org/wiki/display/AST/Media+Architecture+Proposal for
notes on that work) which led to the creation of the ast_format structure.
This structure allowed Asterisk to handle attributes and bundle information
with a format.
Additionally, ast_format_cap was created to act as a container for multiple
formats that, together, formed the capability of some entity. Another
mechanism was added to allow logic to be registered which performed format
attribute negotiation. Everywhere throughout the codebase Asterisk was
changed to use this strategy.
Unfortunately, in software, there is no free lunch. These new capabilities
came at a cost.
Performance analysis and profiling showed that we spend an inordinate
amount of time comparing, copying, and generally manipulating formats and
their related structures. Basic prototyping has shown that a reasonably
large performance improvement could be made in this area. This patch is the
result of that project, which overhauled the media format architecture
and its usage in Asterisk to improve performance.
Generally, the new philosophy for handling formats is as follows:
* The ast_format structure is reference counted. This removed a large amount
of the memory allocations and copying that was done in prior versions.
* In order to prevent race conditions while keeping things performant, the
ast_format structure is immutable by convention and lock-free. Violate this
tenet at your peril!
* Because formats are reference counted, codecs are also reference counted.
The Asterisk core generally provides built-in codecs and caches the
ast_format structures created to represent them. Generally, to prevent
inordinate amounts of module reference bumping, codecs and formats can be
added at run-time but cannot be removed.
* All compatibility with the bit field representation of codecs/formats has
been moved to a compatibility API. The primary user of this representation
is chan_iax2, which must continue to maintain its bit-field usage of formats
for interoperability concerns.
* When a format is negotiated with attributes, or when a format cannot be
represented by one of the cached formats, a new format object is created or
cloned from an existing format. That format may have the same codec
underlying it, but is a different format than a version of the format with
different attributes or without attributes.
* While formats are reference counted objects, the reference count maintained
on the format should be manipulated with care. Formats are generally cached
and will persist for the lifetime of Asterisk and do not explicitly need
to have their lifetime modified. An exception to this is when the user of a
format does not know where the format came from *and* the user may outlive
the provider of the format. This occurs, for example, when a format is read
from a channel: the channel may have a format with attributes (hence,
non-cached) and the user of the format may last longer than the channel (if
the reference to the channel is released prior to the format's reference).
For more information on this work, see the API design notes:
https://wiki.asterisk.org/wiki/display/AST/Media+Format+Rewrite
Finally, this work was the culmination of a large number of developer's
efforts. Extra thanks goes to Corey Farrell, who took on a large amount of the
work in the Asterisk core, chan_sip, and was an invaluable resource in peer
reviews throughout this project.
There were a substantial number of patches contributed during this work; the
following issues/patch names simply reflect some of the work (and will cause
the release scripts to give attribution to the individuals who work on them).
Reviews:
https://reviewboard.asterisk.org/r/3814
https://reviewboard.asterisk.org/r/3808
https://reviewboard.asterisk.org/r/3805
https://reviewboard.asterisk.org/r/3803
https://reviewboard.asterisk.org/r/3801
https://reviewboard.asterisk.org/r/3798
https://reviewboard.asterisk.org/r/3800
https://reviewboard.asterisk.org/r/3794
https://reviewboard.asterisk.org/r/3793
https://reviewboard.asterisk.org/r/3792
https://reviewboard.asterisk.org/r/3791
https://reviewboard.asterisk.org/r/3790
https://reviewboard.asterisk.org/r/3789
https://reviewboard.asterisk.org/r/3788
https://reviewboard.asterisk.org/r/3787
https://reviewboard.asterisk.org/r/3786
https://reviewboard.asterisk.org/r/3784
https://reviewboard.asterisk.org/r/3783
https://reviewboard.asterisk.org/r/3778
https://reviewboard.asterisk.org/r/3774
https://reviewboard.asterisk.org/r/3775
https://reviewboard.asterisk.org/r/3772
https://reviewboard.asterisk.org/r/3761
https://reviewboard.asterisk.org/r/3754
https://reviewboard.asterisk.org/r/3753
https://reviewboard.asterisk.org/r/3751
https://reviewboard.asterisk.org/r/3750
https://reviewboard.asterisk.org/r/3748
https://reviewboard.asterisk.org/r/3747
https://reviewboard.asterisk.org/r/3746
https://reviewboard.asterisk.org/r/3742
https://reviewboard.asterisk.org/r/3740
https://reviewboard.asterisk.org/r/3739
https://reviewboard.asterisk.org/r/3738
https://reviewboard.asterisk.org/r/3737
https://reviewboard.asterisk.org/r/3736
https://reviewboard.asterisk.org/r/3734
https://reviewboard.asterisk.org/r/3722
https://reviewboard.asterisk.org/r/3713
https://reviewboard.asterisk.org/r/3703
https://reviewboard.asterisk.org/r/3689
https://reviewboard.asterisk.org/r/3687
https://reviewboard.asterisk.org/r/3674
https://reviewboard.asterisk.org/r/3671
https://reviewboard.asterisk.org/r/3667
https://reviewboard.asterisk.org/r/3665
https://reviewboard.asterisk.org/r/3625
https://reviewboard.asterisk.org/r/3602
https://reviewboard.asterisk.org/r/3519
https://reviewboard.asterisk.org/r/3518
https://reviewboard.asterisk.org/r/3516
https://reviewboard.asterisk.org/r/3515
https://reviewboard.asterisk.org/r/3512
https://reviewboard.asterisk.org/r/3506
https://reviewboard.asterisk.org/r/3413
https://reviewboard.asterisk.org/r/3410
https://reviewboard.asterisk.org/r/3387
https://reviewboard.asterisk.org/r/3388
https://reviewboard.asterisk.org/r/3389
https://reviewboard.asterisk.org/r/3390
https://reviewboard.asterisk.org/r/3321
https://reviewboard.asterisk.org/r/3320
https://reviewboard.asterisk.org/r/3319
https://reviewboard.asterisk.org/r/3318
https://reviewboard.asterisk.org/r/3266
https://reviewboard.asterisk.org/r/3265
https://reviewboard.asterisk.org/r/3234
https://reviewboard.asterisk.org/r/3178
ASTERISK-23114 #close
Reported by: mjordan
media_formats_translation_core.diff uploaded by kharwell (License 6464)
rb3506.diff uploaded by mjordan (License 6283)
media_format_app_file.diff uploaded by kharwell (License 6464)
misc-2.diff uploaded by file (License 5000)
chan_mild-3.diff uploaded by file (License 5000)
chan_obscure.diff uploaded by file (License 5000)
jingle.diff uploaded by file (License 5000)
funcs.diff uploaded by file (License 5000)
formats.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
bridges.diff uploaded by file (License 5000)
mf-codecs-2.diff uploaded by file (License 5000)
mf-app_fax.diff uploaded by file (License 5000)
mf-apps-3.diff uploaded by file (License 5000)
media-formats-3.diff uploaded by file (License 5000)
ASTERISK-23715
rb3713.patch uploaded by coreyfarrell (License 5909)
rb3689.patch uploaded by mjordan (License 6283)
ASTERISK-23957
rb3722.patch uploaded by mjordan (License 6283)
mf-attributes-3.diff uploaded by file (License 5000)
ASTERISK-23958
Tested by: jrose
rb3822.patch uploaded by coreyfarrell (License 5909)
rb3800.patch uploaded by jrose (License 6182)
chan_sip.diff uploaded by mjordan (License 6283)
rb3747.patch uploaded by jrose (License 6182)
ASTERISK-23959 #close
Tested by: sgriepentrog, mjordan, coreyfarrell
sip_cleanup.diff uploaded by opticron (License 6273)
chan_sip_caps.diff uploaded by mjordan (License 6283)
rb3751.patch uploaded by coreyfarrell (License 5909)
chan_sip-3.diff uploaded by file (License 5000)
ASTERISK-23960 #close
Tested by: opticron
direct_media.diff uploaded by opticron (License 6273)
pjsip-direct-media.diff uploaded by file (License 5000)
format_cap_remove.diff uploaded by opticron (License 6273)
media_format_fixes.diff uploaded by opticron (License 6273)
chan_pjsip-2.diff uploaded by file (License 5000)
ASTERISK-23966 #close
Tested by: rmudgett
rb3803.patch uploaded by rmudgetti (License 5621)
chan_dahdi.diff uploaded by file (License 5000)
ASTERISK-24064 #close
Tested by: coreyfarrell, mjordan, opticron, file, rmudgett, sgriepentrog, jrose
rb3814.patch uploaded by rmudgett (License 5621)
moh_cleanup.diff uploaded by opticron (License 6273)
bridge_leak.diff uploaded by opticron (License 6273)
translate.diff uploaded by file (License 5000)
rb3795.patch uploaded by rmudgett (License 5621)
tls_fix.diff uploaded by mjordan (License 6283)
fax-mf-fix-2.diff uploaded by file (License 5000)
rtp_transfer_stuff uploaded by mjordan (License 6283)
rb3787.patch uploaded by rmudgett (License 5621)
media-formats-explicit-translate-format-3.diff uploaded by file (License 5000)
format_cache_case_fix.diff uploaded by opticron (License 6273)
rb3774.patch uploaded by rmudgett (License 5621)
rb3775.patch uploaded by rmudgett (License 5621)
rtp_engine_fix.diff uploaded by opticron (License 6273)
rtp_crash_fix.diff uploaded by opticron (License 6273)
rb3753.patch uploaded by mjordan (License 6283)
rb3750.patch uploaded by mjordan (License 6283)
rb3748.patch uploaded by rmudgett (License 5621)
media_format_fixes.diff uploaded by opticron (License 6273)
rb3740.patch uploaded by mjordan (License 6283)
rb3739.patch uploaded by mjordan (License 6283)
rb3734.patch uploaded by mjordan (License 6283)
rb3689.patch uploaded by mjordan (License 6283)
rb3674.patch uploaded by coreyfarrell (License 5909)
rb3671.patch uploaded by coreyfarrell (License 5909)
rb3667.patch uploaded by coreyfarrell (License 5909)
rb3665.patch uploaded by mjordan (License 6283)
rb3625.patch uploaded by coreyfarrell (License 5909)
rb3602.patch uploaded by coreyfarrell (License 5909)
format_compatibility-2.diff uploaded by file (License 5000)
core.diff uploaded by file (License 5000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@419044 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2014-07-20 22:06:33 +00:00
|
|
|
ast_format_cap_append(alsa_tech.capabilities, ast_format_slin, 0);
|
2006-05-31 16:56:50 +00:00
|
|
|
|
|
|
|
/* Copy the default jb config over global_jbconf */
|
|
|
|
memcpy(&global_jbconf, &default_jbconf, sizeof(struct ast_jb_conf));
|
|
|
|
|
2006-07-19 20:44:39 +00:00
|
|
|
strcpy(mohinterpret, "default");
|
|
|
|
|
2008-09-12 23:30:03 +00:00
|
|
|
if (!(cfg = ast_config_load(config, config_flags))) {
|
2009-05-27 13:02:54 +00:00
|
|
|
ast_log(LOG_ERROR, "Unable to read ALSA configuration file %s. Aborting.\n", config);
|
2006-09-21 22:32:28 +00:00
|
|
|
return AST_MODULE_LOAD_DECLINE;
|
2008-09-12 23:30:03 +00:00
|
|
|
} else if (cfg == CONFIG_STATUS_FILEINVALID) {
|
|
|
|
ast_log(LOG_ERROR, "%s is in an invalid format. Aborting.\n", config);
|
|
|
|
return AST_MODULE_LOAD_DECLINE;
|
|
|
|
}
|
2006-09-08 03:46:33 +00:00
|
|
|
|
2006-09-21 22:32:28 +00:00
|
|
|
v = ast_variable_browse(cfg, "general");
|
|
|
|
for (; v; v = v->next) {
|
|
|
|
/* handle jb conf */
|
2009-11-12 23:37:36 +00:00
|
|
|
if (!ast_jb_read_conf(&global_jbconf, v->name, v->value)) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!strcasecmp(v->name, "autoanswer")) {
|
2006-09-21 22:32:28 +00:00
|
|
|
autoanswer = ast_true(v->value);
|
2009-11-12 23:37:36 +00:00
|
|
|
} else if (!strcasecmp(v->name, "mute")) {
|
|
|
|
mute = ast_true(v->value);
|
|
|
|
} else if (!strcasecmp(v->name, "noaudiocapture")) {
|
|
|
|
noaudiocapture = ast_true(v->value);
|
|
|
|
} else if (!strcasecmp(v->name, "silencesuppression")) {
|
2006-09-21 22:32:28 +00:00
|
|
|
silencesuppression = ast_true(v->value);
|
2009-11-12 23:37:36 +00:00
|
|
|
} else if (!strcasecmp(v->name, "silencethreshold")) {
|
2006-09-21 22:32:28 +00:00
|
|
|
silencethreshold = atoi(v->value);
|
2009-11-12 23:37:36 +00:00
|
|
|
} else if (!strcasecmp(v->name, "context")) {
|
2006-09-21 22:32:28 +00:00
|
|
|
ast_copy_string(context, v->value, sizeof(context));
|
2009-11-12 23:37:36 +00:00
|
|
|
} else if (!strcasecmp(v->name, "language")) {
|
2006-09-21 22:32:28 +00:00
|
|
|
ast_copy_string(language, v->value, sizeof(language));
|
2009-11-12 23:37:36 +00:00
|
|
|
} else if (!strcasecmp(v->name, "extension")) {
|
2006-09-21 22:32:28 +00:00
|
|
|
ast_copy_string(exten, v->value, sizeof(exten));
|
2009-11-12 23:37:36 +00:00
|
|
|
} else if (!strcasecmp(v->name, "input_device")) {
|
2006-09-21 22:32:28 +00:00
|
|
|
ast_copy_string(indevname, v->value, sizeof(indevname));
|
2009-11-12 23:37:36 +00:00
|
|
|
} else if (!strcasecmp(v->name, "output_device")) {
|
2006-09-21 22:32:28 +00:00
|
|
|
ast_copy_string(outdevname, v->value, sizeof(outdevname));
|
2009-11-12 23:37:36 +00:00
|
|
|
} else if (!strcasecmp(v->name, "mohinterpret")) {
|
2006-09-21 22:32:28 +00:00
|
|
|
ast_copy_string(mohinterpret, v->value, sizeof(mohinterpret));
|
2009-11-12 23:37:36 +00:00
|
|
|
}
|
2004-07-27 02:46:24 +00:00
|
|
|
}
|
2006-09-21 22:32:28 +00:00
|
|
|
ast_config_destroy(cfg);
|
|
|
|
|
|
|
|
if (soundcard_init() < 0) {
|
2007-07-26 15:49:18 +00:00
|
|
|
ast_verb(2, "No sound card detected -- console channel will be unavailable\n");
|
|
|
|
ast_verb(2, "Turn off ALSA support by adding 'noload=chan_alsa.so' in /etc/asterisk/modules.conf\n");
|
2017-04-11 16:07:39 +00:00
|
|
|
unload_module();
|
|
|
|
|
2006-09-21 22:32:28 +00:00
|
|
|
return AST_MODULE_LOAD_DECLINE;
|
2004-04-11 01:59:11 +00:00
|
|
|
}
|
2004-12-27 14:51:52 +00:00
|
|
|
|
2006-09-21 22:32:28 +00:00
|
|
|
if (ast_channel_register(&alsa_tech)) {
|
2006-02-01 23:05:28 +00:00
|
|
|
ast_log(LOG_ERROR, "Unable to register channel class 'Console'\n");
|
2017-04-11 16:07:39 +00:00
|
|
|
unload_module();
|
|
|
|
|
|
|
|
return AST_MODULE_LOAD_DECLINE;
|
2002-02-19 20:14:14 +00:00
|
|
|
}
|
2006-09-21 22:32:28 +00:00
|
|
|
|
2008-12-05 10:31:25 +00:00
|
|
|
ast_cli_register_multiple(cli_alsa, ARRAY_LEN(cli_alsa));
|
2006-09-18 19:54:18 +00:00
|
|
|
|
2006-09-21 22:32:28 +00:00
|
|
|
return AST_MODULE_LOAD_SUCCESS;
|
2002-02-19 20:14:14 +00:00
|
|
|
}
|
|
|
|
|
2010-07-20 19:35:02 +00:00
|
|
|
AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "ALSA Console Channel Driver",
|
2015-05-06 00:49:04 +00:00
|
|
|
.support_level = AST_MODULE_SUPPORT_EXTENDED,
|
|
|
|
.load = load_module,
|
|
|
|
.unload = unload_module,
|
|
|
|
.load_pri = AST_MODPRI_CHANNEL_DRIVER,
|
|
|
|
);
|