-Functional changes 1. Dynamic global format list build by codecs defined in codecs.conf 2. SILK 8khz, 12khz, 16khz, and 24khz with custom attributes defined in codecs.conf 3. Negotiation of SILK attributes in chan_sip. 4. SPEEX 32khz with translation 5. SLINEAR 8khz, 12khz, 24khz, 32khz, 44.1khz, 48khz, 96khz, 192khz with translation using codec_resample.c 6. Various changes to RTP code required to properly handle the dynamic format list and formats with attributes. 7. ConfBridge now dynamically jumps to the best possible sample rate. This allows for conferences to take advantage of HD audio (Which sounds awesome) 8. Audiohooks are no longer limited to 8khz audio, and most effects have been updated to take advantage of this such as Volume, DENOISE, PITCH_SHIFT. 9. codec_resample now uses its own code rather than depending on libresample. -Organizational changes Global format list is moved from frame.c to format.c Various format specific functions moved from frame.c to format.c Review: https://reviewboard.asterisk.org/r/1104/ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@308582 65c4cc65-6c06-0410-ace0-fbb531ad65f3
211 lines
5.3 KiB
C
211 lines
5.3 KiB
C
/*
|
|
* Asterisk -- An open source telephony toolkit.
|
|
*
|
|
* Copyright (C) 2005, Anthony Minessale II.
|
|
*
|
|
* Anthony Minessale <anthmct@yahoo.com>
|
|
*
|
|
* 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 A machine to gather up arbitrary frames and convert them
|
|
* to raw slinear on demand.
|
|
*
|
|
* \author Anthony Minessale <anthmct@yahoo.com>
|
|
*/
|
|
|
|
#include "asterisk.h"
|
|
|
|
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
|
|
|
#include "asterisk/frame.h"
|
|
#include "asterisk/slinfactory.h"
|
|
#include "asterisk/translate.h"
|
|
|
|
void ast_slinfactory_init(struct ast_slinfactory *sf)
|
|
{
|
|
memset(sf, 0, sizeof(*sf));
|
|
sf->offset = sf->hold;
|
|
ast_format_set(&sf->output_format, AST_FORMAT_SLINEAR, 0);
|
|
}
|
|
|
|
int ast_slinfactory_init_with_format(struct ast_slinfactory *sf, const struct ast_format *slin_out)
|
|
{
|
|
memset(sf, 0, sizeof(*sf));
|
|
sf->offset = sf->hold;
|
|
if (!ast_format_is_slinear(slin_out)) {
|
|
return -1;
|
|
}
|
|
ast_format_copy(&sf->output_format, slin_out);
|
|
|
|
return 0;
|
|
}
|
|
|
|
void ast_slinfactory_destroy(struct ast_slinfactory *sf)
|
|
{
|
|
struct ast_frame *f;
|
|
|
|
if (sf->trans) {
|
|
ast_translator_free_path(sf->trans);
|
|
sf->trans = NULL;
|
|
}
|
|
|
|
while ((f = AST_LIST_REMOVE_HEAD(&sf->queue, frame_list)))
|
|
ast_frfree(f);
|
|
}
|
|
|
|
int ast_slinfactory_feed(struct ast_slinfactory *sf, struct ast_frame *f)
|
|
{
|
|
struct ast_frame *begin_frame = f, *duped_frame = NULL, *frame_ptr;
|
|
unsigned int x = 0;
|
|
|
|
/* In some cases, we can be passed a frame which has no data in it, but
|
|
* which has a positive number of samples defined. Once such situation is
|
|
* when a jitter buffer is in use and the jitter buffer interpolates a frame.
|
|
* The frame it produces has data set to NULL, datalen set to 0, and samples
|
|
* set to either 160 or 240.
|
|
*/
|
|
if (!f->data.ptr) {
|
|
return 0;
|
|
}
|
|
|
|
if (ast_format_cmp(&f->subclass.format, &sf->output_format) == AST_FORMAT_CMP_NOT_EQUAL) {
|
|
if (sf->trans && (ast_format_cmp(&f->subclass.format, &sf->format) == AST_FORMAT_CMP_NOT_EQUAL)) {
|
|
ast_translator_free_path(sf->trans);
|
|
sf->trans = NULL;
|
|
}
|
|
|
|
if (!sf->trans) {
|
|
if (!(sf->trans = ast_translator_build_path(&sf->output_format, &f->subclass.format))) {
|
|
ast_log(LOG_WARNING, "Cannot build a path from %s (%d)to %s (%d)\n",
|
|
ast_getformatname(&f->subclass.format),
|
|
f->subclass.format.id,
|
|
ast_getformatname(&sf->output_format),
|
|
sf->output_format.id);
|
|
return 0;
|
|
}
|
|
ast_format_copy(&sf->format, &f->subclass.format);
|
|
}
|
|
|
|
if (!(begin_frame = ast_translate(sf->trans, f, 0))) {
|
|
return 0;
|
|
}
|
|
|
|
if (!(duped_frame = ast_frisolate(begin_frame))) {
|
|
return 0;
|
|
}
|
|
|
|
if (duped_frame != begin_frame) {
|
|
ast_frfree(begin_frame);
|
|
}
|
|
} else {
|
|
if (sf->trans) {
|
|
ast_translator_free_path(sf->trans);
|
|
sf->trans = NULL;
|
|
}
|
|
if (!(duped_frame = ast_frdup(f)))
|
|
return 0;
|
|
}
|
|
|
|
AST_LIST_TRAVERSE(&sf->queue, frame_ptr, frame_list) {
|
|
x++;
|
|
}
|
|
|
|
/* if the frame was translated, the translator may have returned multiple
|
|
frames, so process each of them
|
|
*/
|
|
for (begin_frame = duped_frame; begin_frame; begin_frame = AST_LIST_NEXT(begin_frame, frame_list)) {
|
|
AST_LIST_INSERT_TAIL(&sf->queue, begin_frame, frame_list);
|
|
sf->size += begin_frame->samples;
|
|
}
|
|
|
|
return x;
|
|
}
|
|
|
|
int ast_slinfactory_read(struct ast_slinfactory *sf, short *buf, size_t samples)
|
|
{
|
|
struct ast_frame *frame_ptr;
|
|
unsigned int sofar = 0, ineed, remain;
|
|
short *frame_data, *offset = buf;
|
|
|
|
while (sofar < samples) {
|
|
ineed = samples - sofar;
|
|
|
|
if (sf->holdlen) {
|
|
if (sf->holdlen <= ineed) {
|
|
memcpy(offset, sf->hold, sf->holdlen * sizeof(*offset));
|
|
sofar += sf->holdlen;
|
|
offset += sf->holdlen;
|
|
sf->holdlen = 0;
|
|
sf->offset = sf->hold;
|
|
} else {
|
|
remain = sf->holdlen - ineed;
|
|
memcpy(offset, sf->offset, ineed * sizeof(*offset));
|
|
sofar += ineed;
|
|
sf->offset += ineed;
|
|
sf->holdlen = remain;
|
|
}
|
|
continue;
|
|
}
|
|
|
|
if ((frame_ptr = AST_LIST_REMOVE_HEAD(&sf->queue, frame_list))) {
|
|
frame_data = frame_ptr->data.ptr;
|
|
|
|
if (frame_ptr->samples <= ineed) {
|
|
memcpy(offset, frame_data, frame_ptr->samples * sizeof(*offset));
|
|
sofar += frame_ptr->samples;
|
|
offset += frame_ptr->samples;
|
|
} else {
|
|
remain = frame_ptr->samples - ineed;
|
|
memcpy(offset, frame_data, ineed * sizeof(*offset));
|
|
sofar += ineed;
|
|
frame_data += ineed;
|
|
if (remain > (AST_SLINFACTORY_MAX_HOLD - sf->holdlen)) {
|
|
remain = AST_SLINFACTORY_MAX_HOLD - sf->holdlen;
|
|
}
|
|
memcpy(sf->hold, frame_data, remain * sizeof(*offset));
|
|
sf->holdlen = remain;
|
|
}
|
|
ast_frfree(frame_ptr);
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
|
|
sf->size -= sofar;
|
|
return sofar;
|
|
}
|
|
|
|
unsigned int ast_slinfactory_available(const struct ast_slinfactory *sf)
|
|
{
|
|
return sf->size;
|
|
}
|
|
|
|
void ast_slinfactory_flush(struct ast_slinfactory *sf)
|
|
{
|
|
struct ast_frame *fr = NULL;
|
|
|
|
if (sf->trans) {
|
|
ast_translator_free_path(sf->trans);
|
|
sf->trans = NULL;
|
|
}
|
|
|
|
while ((fr = AST_LIST_REMOVE_HEAD(&sf->queue, frame_list)))
|
|
ast_frfree(fr);
|
|
|
|
sf->size = sf->holdlen = 0;
|
|
sf->offset = sf->hold;
|
|
|
|
return;
|
|
}
|