2009-06-30 16:40:38 +00:00
|
|
|
/*
|
|
|
|
* Asterisk -- An open source telephony toolkit.
|
|
|
|
*
|
|
|
|
* Anthony Minessale <anthmct@yahoo.com>
|
|
|
|
*
|
|
|
|
* Derived from other asterisk sound formats by
|
|
|
|
* Mark Spencer <markster@linux-support.net>
|
|
|
|
*
|
|
|
|
* Thanks to mpglib from http://www.mpg123.org/
|
|
|
|
* and Chris Stenton [jacs@gnome.co.uk]
|
|
|
|
* for coding the ability to play stereo and non-8khz files
|
2012-05-12 00:03:42 +00:00
|
|
|
|
2009-06-30 16:40:38 +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.
|
|
|
|
*
|
|
|
|
* This program is free software, distributed under the terms of
|
|
|
|
* the GNU General Public License Version 2. See the LICENSE file
|
|
|
|
* at the top of the source tree.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*!
|
|
|
|
* \file
|
|
|
|
* \brief MP3 Format Handler
|
|
|
|
* \ingroup formats
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*** MODULEINFO
|
|
|
|
<defaultenabled>no</defaultenabled>
|
2011-07-14 20:28:54 +00:00
|
|
|
<support_level>extended</support_level>
|
2009-06-30 16:40:38 +00:00
|
|
|
***/
|
|
|
|
|
|
|
|
#include "asterisk.h"
|
|
|
|
|
|
|
|
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
|
|
|
|
|
|
|
#include "mp3/mpg123.h"
|
|
|
|
#include "mp3/mpglib.h"
|
|
|
|
|
|
|
|
#include "asterisk/module.h"
|
|
|
|
#include "asterisk/mod_format.h"
|
|
|
|
#include "asterisk/logger.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"
|
2009-06-30 16:40:38 +00:00
|
|
|
|
|
|
|
#define MP3_BUFLEN 320
|
|
|
|
#define MP3_SCACHE 16384
|
|
|
|
#define MP3_DCACHE 8192
|
|
|
|
|
|
|
|
struct mp3_private {
|
2012-05-12 00:03:42 +00:00
|
|
|
/*! state for the mp3 decoder */
|
2009-06-30 16:40:38 +00:00
|
|
|
struct mpstr mp;
|
2012-05-12 00:03:42 +00:00
|
|
|
/*! buffer to hold mp3 data after read from disk */
|
2009-06-30 16:40:38 +00:00
|
|
|
char sbuf[MP3_SCACHE];
|
2012-05-12 00:03:42 +00:00
|
|
|
/*! buffer for slinear audio after being decoded out of sbuf */
|
2009-06-30 16:40:38 +00:00
|
|
|
char dbuf[MP3_DCACHE];
|
2012-05-12 00:03:42 +00:00
|
|
|
/*! how much data has been written to the output buffer in the ast_filestream */
|
2009-06-30 16:40:38 +00:00
|
|
|
int buflen;
|
2012-05-12 00:03:42 +00:00
|
|
|
/*! how much data has been written to sbuf */
|
2009-06-30 16:40:38 +00:00
|
|
|
int sbuflen;
|
2012-05-12 00:03:42 +00:00
|
|
|
/*! how much data is left to be read out of dbuf, starting at dbufoffset */
|
2009-06-30 16:40:38 +00:00
|
|
|
int dbuflen;
|
2012-05-12 00:03:42 +00:00
|
|
|
/*! current offset for reading data out of dbuf */
|
2009-06-30 16:40:38 +00:00
|
|
|
int dbufoffset;
|
|
|
|
int offset;
|
|
|
|
long seek;
|
|
|
|
};
|
|
|
|
|
|
|
|
static const char name[] = "mp3";
|
|
|
|
|
|
|
|
#define BLOCKSIZE 160
|
|
|
|
#define OUTSCALE 4096
|
|
|
|
|
|
|
|
#define GAIN -4 /* 2^GAIN is the multiple to increase the volume by */
|
|
|
|
|
|
|
|
#if __BYTE_ORDER == __LITTLE_ENDIAN
|
|
|
|
#define htoll(b) (b)
|
|
|
|
#define htols(b) (b)
|
|
|
|
#define ltohl(b) (b)
|
|
|
|
#define ltohs(b) (b)
|
|
|
|
#else
|
|
|
|
#if __BYTE_ORDER == __BIG_ENDIAN
|
|
|
|
#define htoll(b) \
|
|
|
|
(((((b) ) & 0xFF) << 24) | \
|
|
|
|
((((b) >> 8) & 0xFF) << 16) | \
|
|
|
|
((((b) >> 16) & 0xFF) << 8) | \
|
|
|
|
((((b) >> 24) & 0xFF) ))
|
|
|
|
#define htols(b) \
|
|
|
|
(((((b) ) & 0xFF) << 8) | \
|
|
|
|
((((b) >> 8) & 0xFF) ))
|
|
|
|
#define ltohl(b) htoll(b)
|
|
|
|
#define ltohs(b) htols(b)
|
|
|
|
#else
|
|
|
|
#error "Endianess not defined"
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
static int mp3_open(struct ast_filestream *s)
|
|
|
|
{
|
|
|
|
struct mp3_private *p = s->_private;
|
|
|
|
InitMP3(&p->mp, OUTSCALE);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void mp3_close(struct ast_filestream *s)
|
|
|
|
{
|
|
|
|
struct mp3_private *p = s->_private;
|
2012-05-12 00:03:42 +00:00
|
|
|
|
2009-06-30 16:40:38 +00:00
|
|
|
ExitMP3(&p->mp);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2012-05-12 00:03:42 +00:00
|
|
|
static int mp3_squeue(struct ast_filestream *s)
|
2009-06-30 16:40:38 +00:00
|
|
|
{
|
|
|
|
struct mp3_private *p = s->_private;
|
|
|
|
int res=0;
|
2012-05-12 00:03:42 +00:00
|
|
|
|
|
|
|
res = ftell(s->f);
|
2009-06-30 16:40:38 +00:00
|
|
|
p->sbuflen = fread(p->sbuf, 1, MP3_SCACHE, s->f);
|
|
|
|
if(p->sbuflen < 0) {
|
|
|
|
ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", p->sbuflen, strerror(errno));
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
res = decodeMP3(&p->mp,p->sbuf,p->sbuflen,p->dbuf,MP3_DCACHE,&p->dbuflen);
|
|
|
|
if(res != MP3_OK)
|
|
|
|
return -1;
|
|
|
|
p->sbuflen -= p->dbuflen;
|
|
|
|
p->dbufoffset = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-05-12 00:03:42 +00:00
|
|
|
static int mp3_dqueue(struct ast_filestream *s)
|
2009-06-30 16:40:38 +00:00
|
|
|
{
|
|
|
|
struct mp3_private *p = s->_private;
|
|
|
|
int res=0;
|
2012-05-12 00:03:42 +00:00
|
|
|
|
2009-06-30 16:40:38 +00:00
|
|
|
if((res = decodeMP3(&p->mp,NULL,0,p->dbuf,MP3_DCACHE,&p->dbuflen)) == MP3_OK) {
|
|
|
|
p->sbuflen -= p->dbuflen;
|
|
|
|
p->dbufoffset = 0;
|
|
|
|
}
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mp3_queue(struct ast_filestream *s)
|
|
|
|
{
|
|
|
|
struct mp3_private *p = s->_private;
|
|
|
|
int res = 0, bytes = 0;
|
2012-05-12 00:03:42 +00:00
|
|
|
|
2009-06-30 16:40:38 +00:00
|
|
|
if(p->seek) {
|
|
|
|
ExitMP3(&p->mp);
|
|
|
|
InitMP3(&p->mp, OUTSCALE);
|
|
|
|
fseek(s->f, 0, SEEK_SET);
|
|
|
|
p->sbuflen = p->dbuflen = p->offset = 0;
|
|
|
|
while(p->offset < p->seek) {
|
|
|
|
if(mp3_squeue(s))
|
|
|
|
return -1;
|
|
|
|
while(p->offset < p->seek && ((res = mp3_dqueue(s))) == MP3_OK) {
|
|
|
|
for(bytes = 0 ; bytes < p->dbuflen ; bytes++) {
|
|
|
|
p->dbufoffset++;
|
|
|
|
p->offset++;
|
|
|
|
if(p->offset >= p->seek)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if(res == MP3_ERR)
|
|
|
|
return -1;
|
|
|
|
}
|
2012-05-12 00:03:42 +00:00
|
|
|
|
2009-06-30 16:40:38 +00:00
|
|
|
p->seek = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if(p->dbuflen == 0) {
|
|
|
|
if(p->sbuflen) {
|
|
|
|
res = mp3_dqueue(s);
|
|
|
|
if(res == MP3_ERR)
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if(! p->sbuflen || res != MP3_OK) {
|
|
|
|
if(mp3_squeue(s))
|
|
|
|
return -1;
|
|
|
|
}
|
2012-05-12 00:03:42 +00:00
|
|
|
|
2009-06-30 16:40:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct ast_frame *mp3_read(struct ast_filestream *s, int *whennext)
|
|
|
|
{
|
|
|
|
|
|
|
|
struct mp3_private *p = s->_private;
|
|
|
|
int delay =0;
|
|
|
|
int save=0;
|
|
|
|
|
2012-05-12 00:03:42 +00:00
|
|
|
/* Pre-populate the buffer that holds audio to be returned (dbuf) */
|
|
|
|
if (mp3_queue(s)) {
|
2009-06-30 16:40:38 +00:00
|
|
|
return NULL;
|
2012-05-12 00:03:42 +00:00
|
|
|
}
|
2009-06-30 16:40:38 +00:00
|
|
|
|
2012-05-12 00:03:42 +00:00
|
|
|
if (p->dbuflen) {
|
|
|
|
/* Read out what's waiting in dbuf */
|
|
|
|
for (p->buflen = 0; p->buflen < MP3_BUFLEN && p->buflen < p->dbuflen; p->buflen++) {
|
|
|
|
s->buf[p->buflen + AST_FRIENDLY_OFFSET] = p->dbuf[p->buflen + p->dbufoffset];
|
2009-06-30 16:40:38 +00:00
|
|
|
}
|
|
|
|
p->dbufoffset += p->buflen;
|
|
|
|
p->dbuflen -= p->buflen;
|
2012-05-12 00:03:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (p->buflen < MP3_BUFLEN) {
|
|
|
|
/* dbuf didn't have enough, so reset dbuf, fill it back up and continue */
|
|
|
|
p->dbuflen = p->dbufoffset = 0;
|
2009-06-30 16:40:38 +00:00
|
|
|
|
2012-05-12 00:03:42 +00:00
|
|
|
if (mp3_queue(s)) {
|
|
|
|
return NULL;
|
|
|
|
}
|
2009-06-30 16:40:38 +00:00
|
|
|
|
2012-05-12 00:03:42 +00:00
|
|
|
/* Make sure dbuf has enough to complete this read attempt */
|
|
|
|
if (p->dbuflen >= (MP3_BUFLEN - p->buflen)) {
|
|
|
|
for (save = p->buflen; p->buflen < MP3_BUFLEN; p->buflen++) {
|
|
|
|
s->buf[p->buflen + AST_FRIENDLY_OFFSET] = p->dbuf[(p->buflen - save) + p->dbufoffset];
|
2009-06-30 16:40:38 +00:00
|
|
|
}
|
|
|
|
p->dbufoffset += (MP3_BUFLEN - save);
|
|
|
|
p->dbuflen -= (MP3_BUFLEN - save);
|
2012-05-12 00:03:42 +00:00
|
|
|
}
|
2009-06-30 16:40:38 +00:00
|
|
|
|
|
|
|
}
|
2012-05-12 00:03:42 +00:00
|
|
|
|
2009-06-30 16:40:38 +00:00
|
|
|
p->offset += p->buflen;
|
2012-05-12 00:03:42 +00:00
|
|
|
delay = p->buflen / 2;
|
Fix memory corruption caused by format_mp3.
format_mp3 claimed that it provided AST_FRIENDLY_OFFSET in frames returned by
read(). However, it lied. This means that other parts of the code that
attempted to make use of the offset buffer would end up corrupting the fields
in the ast_filestream structure. This resulted in quite a few crashes due to
unexpected values for fields in ast_filestream.
This patch closes out quite a few bugs. However, some of these bugs have been
open for a while and have been an area where more than one bug has been
discussed. So with that said, anyone that is following one of the issues
closed here, if you still have a problem, please open a new bug report for the
specific problem you are still having. If you do, please ensure that the bug
report is based on the newest version of Asterisk, and that this patch is
applied if format_mp3 is in use. Thanks!
(closes issue #15109)
Reported by: jvandal
Tested by: aragon, russell, zerohalo, marhbere, rgj
(closes issue #14958)
Reported by: aragon
(closes issue #15123)
Reported by: axisinternet
(closes issue #15041)
Reported by: maxnuv
(closes issue #15396)
Reported by: aragon
(closes issue #15195)
Reported by: amorsen
Tested by: amorsen
(closes issue #15781)
Reported by: jensvb
(closes issue #15735)
Reported by: thom4fun
(closes issue #15460)
Reported by: marhbere
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@215212 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-09-01 20:44:13 +00:00
|
|
|
AST_FRAME_SET_BUFFER(&s->fr, s->buf, AST_FRIENDLY_OFFSET, p->buflen);
|
2009-06-30 16:40:38 +00:00
|
|
|
s->fr.samples = delay;
|
|
|
|
*whennext = delay;
|
|
|
|
return &s->fr;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int mp3_write(struct ast_filestream *fs, struct ast_frame *f)
|
|
|
|
{
|
|
|
|
ast_log(LOG_ERROR,"I Can't write MP3 only read them.\n");
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int mp3_seek(struct ast_filestream *s, off_t sample_offset, int whence)
|
|
|
|
{
|
|
|
|
struct mp3_private *p = s->_private;
|
|
|
|
off_t min,max,cur;
|
|
|
|
long offset=0,samples;
|
|
|
|
samples = sample_offset * 2;
|
|
|
|
|
|
|
|
min = 0;
|
|
|
|
fseek(s->f, 0, SEEK_END);
|
|
|
|
max = ftell(s->f) * 100;
|
|
|
|
cur = p->offset;
|
|
|
|
|
|
|
|
if (whence == SEEK_SET)
|
|
|
|
offset = samples + min;
|
|
|
|
else if (whence == SEEK_CUR || whence == SEEK_FORCECUR)
|
|
|
|
offset = samples + cur;
|
|
|
|
else if (whence == SEEK_END)
|
|
|
|
offset = max - samples;
|
|
|
|
if (whence != SEEK_FORCECUR) {
|
|
|
|
offset = (offset > max)?max:offset;
|
|
|
|
}
|
|
|
|
|
|
|
|
p->seek = offset;
|
2010-01-06 15:35:43 +00:00
|
|
|
return fseek(s->f, offset, SEEK_SET);
|
2012-05-12 00:03:42 +00:00
|
|
|
|
2009-06-30 16:40:38 +00:00
|
|
|
}
|
|
|
|
|
2012-05-12 00:03:42 +00:00
|
|
|
static int mp3_rewrite(struct ast_filestream *s, const char *comment)
|
2009-06-30 16:40:38 +00:00
|
|
|
{
|
|
|
|
ast_log(LOG_ERROR,"I Can't write MP3 only read them.\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2012-05-12 00:03:42 +00:00
|
|
|
static int mp3_trunc(struct ast_filestream *s)
|
2009-06-30 16:40:38 +00:00
|
|
|
{
|
|
|
|
|
|
|
|
ast_log(LOG_ERROR,"I Can't write MP3 only read them.\n");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static off_t mp3_tell(struct ast_filestream *s)
|
|
|
|
{
|
|
|
|
struct mp3_private *p = s->_private;
|
2012-05-12 00:03:42 +00:00
|
|
|
|
2009-06-30 16:40:38 +00:00
|
|
|
return p->offset/2;
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *mp3_getcomment(struct ast_filestream *s)
|
|
|
|
{
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2011-02-03 16:22:10 +00:00
|
|
|
static struct ast_format_def mp3_f = {
|
2009-06-30 16:40:38 +00:00
|
|
|
.name = "mp3",
|
|
|
|
.exts = "mp3",
|
|
|
|
.open = mp3_open,
|
|
|
|
.write = mp3_write,
|
|
|
|
.rewrite = mp3_rewrite,
|
|
|
|
.seek = mp3_seek,
|
|
|
|
.trunc = mp3_trunc,
|
|
|
|
.tell = mp3_tell,
|
|
|
|
.read = mp3_read,
|
|
|
|
.close = mp3_close,
|
|
|
|
.getcomment = mp3_getcomment,
|
|
|
|
.buf_size = MP3_BUFLEN + AST_FRIENDLY_OFFSET,
|
|
|
|
.desc_size = sizeof(struct mp3_private),
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static int load_module(void)
|
|
|
|
{
|
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
|
|
|
mp3_f.format = ast_format_slin;
|
2009-06-30 16:40:38 +00:00
|
|
|
InitMP3Constants();
|
2011-02-03 16:22:10 +00:00
|
|
|
return ast_format_def_register(&mp3_f);
|
2009-06-30 16:40:38 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static int unload_module(void)
|
|
|
|
{
|
2011-02-03 16:22:10 +00:00
|
|
|
return ast_format_def_unregister(name);
|
2012-05-12 00:03:42 +00:00
|
|
|
}
|
2009-06-30 16:40:38 +00:00
|
|
|
|
2014-07-25 16:47:17 +00:00
|
|
|
AST_MODULE_INFO_STANDARD_EXTENDED(ASTERISK_GPL_KEY, "MP3 format [Any rate but 8000hz mono is optimal]");
|
|
|
|
|