kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-02 19:16:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

codecs: Add iLBC 20.

Browse Source 
Asterisk already supported iLBC 30. This change adds iLBC 20. Now, Asterisk
defaults to iLBC 20 but falls back to iLBC 30, when the remote party requests
this.

ASTERISK-26218 #close
ASTERISK-26221 #close
Reported by: Aaron Meriwether

Change-Id: I07f523a3aa1338bb5217a1bf69c1eeb92adedffa
This commit is contained in:
Alexander Traud
2016-07-19 20:39:38 +02:00
parent 943bb48b59
commit 8fb807009f
6 changed files with 252 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
main/codec_builtin.c
View File

@@ -31,6 +31,7 @@
ASTERISK_REGISTER_FILE()
#include "asterisk/ilbc.h"
#include "asterisk/logger.h"
#include "asterisk/astobj2.h"
#include "asterisk/codec.h"
@@ -588,7 +589,12 @@ static struct ast_codec speex32 = {
static int ilbc_samples(struct ast_frame *frame)
{
return 240 * (frame->datalen / 50);
struct ilbc_attr *attr = ast_format_get_attribute_data(frame->subclass.format);
const unsigned int mode = attr ? attr->mode : 30;
const unsigned int samples_per_frame = mode * ast_format_get_sample_rate(frame->subclass.format) / 1000;
const unsigned int octets_per_frame = (mode == 20) ? 38 : 50;
return samples_per_frame * frame->datalen / octets_per_frame;
}
static struct ast_codec ilbc = {
@@ -596,12 +602,12 @@ static struct ast_codec ilbc = {
.description = "iLBC",
.type = AST_MEDIA_TYPE_AUDIO,
.sample_rate = 8000,
.minimum_ms = 30,
.minimum_ms = 20,
.maximum_ms = 300,
.default_ms = 30,
.minimum_bytes = 50,
.default_ms = 20,
.minimum_bytes = 38,
.samples_count = ilbc_samples,
.smooth = 1,
.smooth = 0,
};
static struct ast_codec g722 = {