kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-02 20:08:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge codec_consistency branch. This should make sample usage much happier.

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@150729 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2008-10-17 21:35:23 +00:00
parent 805556773f
commit ae0a736353
37 changed files with 473 additions and 1052 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
codecs/codec_speex.c
View File

@@ -53,10 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/config.h"
#include "asterisk/utils.h"
/* Sample frame data */
#include "slin_speex_ex.h"
#include "speex_slin_ex.h"
/* codec variables */
static int quality = 3;
static int complexity = 2;
@@ -84,6 +80,10 @@ static float pp_dereverb_level = 0.3;
#define BUFFER_SAMPLES 8000
#define SPEEX_SAMPLES 160
/* Sample frame data */
#include "asterisk/slin.h"
#include "ex_speex.h"
struct speex_coder_pvt {
void *speex;
SpeexBits bits;
@@ -154,36 +154,6 @@ static int speextolin_new(struct ast_trans_pvt *pvt)
return 0;
}
static struct ast_frame *lintospeex_sample(void)
{
static struct ast_frame f;
f.frametype = AST_FRAME_VOICE;
f.subclass = AST_FORMAT_SLINEAR;
f.datalen = sizeof(slin_speex_ex);
/* Assume 8000 Hz */
f.samples = sizeof(slin_speex_ex)/2;
f.mallocd = 0;
f.offset = 0;
f.src = __PRETTY_FUNCTION__;
f.data.ptr = slin_speex_ex;
return &f;
}
static struct ast_frame *speextolin_sample(void)
{
static struct ast_frame f;
f.frametype = AST_FRAME_VOICE;
f.subclass = AST_FORMAT_SPEEX;
f.datalen = sizeof(speex_slin_ex);
/* All frames are 20 ms long */
f.samples = SPEEX_SAMPLES;
f.mallocd = 0;
f.offset = 0;
f.src = __PRETTY_FUNCTION__;
f.data.ptr = speex_slin_ex;
return &f;
}
/*! \brief convert and store into outbuf */
static int speextolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
{
@@ -346,7 +316,7 @@ static struct ast_translator speextolin = {
.newpvt = speextolin_new,
.framein = speextolin_framein,
.destroy = speextolin_destroy,
.sample = speextolin_sample,
.sample = speex_sample,
.desc_size = sizeof(struct speex_coder_pvt),
.buffer_samples = BUFFER_SAMPLES,
.buf_size = BUFFER_SAMPLES * 2,
@@ -361,7 +331,7 @@ static struct ast_translator lintospeex = {
.framein = lintospeex_framein,
.frameout = lintospeex_frameout,
.destroy = lintospeex_destroy,
.sample = lintospeex_sample,
.sample = slin8_sample,
.desc_size = sizeof(struct speex_coder_pvt),
.buffer_samples = BUFFER_SAMPLES,
.buf_size = BUFFER_SAMPLES * 2, /* XXX maybe a lot less ? */