kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-31 02:37:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make ADPCM frames standard

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@2400 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2004-03-11 19:57:10 +00:00
parent f12928f700
commit 39c60235f8
2 changed files with 16 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
codecs/codec_adpcm.c
View File

@@ -27,7 +27,6 @@
#include <unistd.h>
#define BUFFER_SIZE 8096 /* size for the translation buffers */
#define BUF_SHIFT 5
static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
static int localusecnt = 0;
@@ -200,6 +199,10 @@ struct adpcm_decoder_pvt
struct ast_frame f;
char offset[AST_FRIENDLY_OFFSET]; /* Space to build offset */
short outbuf[BUFFER_SIZE]; /* Decoded signed linear values */
short ssindex;
short signal;
unsigned char zero_count;
unsigned char next_flag;
int tail;
};
@@ -272,41 +275,21 @@ adpcmtolin_framein (struct ast_translator_pvt *pvt, struct ast_frame *f)
{
struct adpcm_decoder_pvt *tmp = (struct adpcm_decoder_pvt *) pvt;
int x;
short signal;
short ssindex;
unsigned char *b;
unsigned char zero_count;
unsigned char next_flag;
if (f->datalen < BUF_SHIFT) {
ast_log(LOG_WARNING, "Didn't have at least %d bytes of input\n", BUF_SHIFT);
return -1;
}
if ((f->datalen - BUF_SHIFT) * 4 > sizeof(tmp->outbuf)) {
if (f->datalen * 4 > sizeof(tmp->outbuf)) {
ast_log(LOG_WARNING, "Out of buffer space\n");
return -1;
}
/* Reset ssindex and signal to frame's specified values */
b = f->data;
ssindex = b[0];
if (ssindex < 0)
ssindex = 0;
if (ssindex > 48)
ssindex = 48;
signal = (b[1] << 8) | b[2];
for (x=0;x<f->datalen;x++) {
decode((b[x] >> 4) & 0xf, &tmp->ssindex, &tmp->signal, &tmp->zero_count, &tmp->next_flag);
tmp->outbuf[tmp->tail++] = tmp->signal << 4;
zero_count = b[3];
next_flag = b[4];
for (x=BUF_SHIFT;x<f->datalen;x++) {
decode((b[x] >> 4) & 0xf, &ssindex, &signal, &zero_count, &next_flag);
tmp->outbuf[tmp->tail++] = signal << 4;
decode(b[x] & 0x0f, &ssindex, &signal, &zero_count, &next_flag);
tmp->outbuf[tmp->tail++] = signal << 4;
decode(b[x] & 0x0f, &tmp->ssindex, &tmp->signal, &tmp->zero_count, &tmp->next_flag);
tmp->outbuf[tmp->tail++] = tmp->signal << 4;
}
return 0;
@@ -408,7 +391,7 @@ lintoadpcm_frameout (struct ast_translator_pvt *pvt)
adpcm0 = adpcm (tmp->inbuf[i], &tmp->ssindex, &tmp->signal, &tmp->zero_count, &tmp->next_flag);
adpcm1 = adpcm (tmp->inbuf[i+1], &tmp->ssindex, &tmp->signal, &tmp->zero_count, &tmp->next_flag);
tmp->outbuf[i/2 + BUF_SHIFT] = (adpcm0 << 4) | adpcm1;
tmp->outbuf[i/2] = (adpcm0 << 4) | adpcm1;
};
@@ -419,7 +402,7 @@ lintoadpcm_frameout (struct ast_translator_pvt *pvt)
tmp->f.offset = AST_FRIENDLY_OFFSET;
tmp->f.src = __PRETTY_FUNCTION__;
tmp->f.data = tmp->outbuf;
tmp->f.datalen = i_max / 2 + BUF_SHIFT;
tmp->f.datalen = i_max / 2;
/*
* If there is a signal left over (there should be no more than