kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-22 12:52:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

add some code optimizations, see the report for an explanation

Browse Source 
(issue #7105, Mithraen)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@29018 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-05-20 13:37:11 +00:00
parent 9d53a3e7f5
commit b88c06b8b5
4 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
codecs/codec_a_mu.c
View File

@@ -55,12 +55,12 @@ static unsigned char a2mu[256];
/*! \brief convert frame data and store into the buffer */ /*! \brief convert frame data and store into the buffer */
static int alawtoulaw_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) static int alawtoulaw_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
{ {
int i; int x = f->samples;
int in_samples = f->samples; int in_samples = f->samples;
unsigned char *src = f->data; unsigned char *src = f->data;
unsigned char *dst = (unsigned char *)pvt->outbuf + pvt->samples; unsigned char *dst = (unsigned char *)pvt->outbuf + pvt->samples;
for (i = 0; i < in_samples; i++) while (x--)
*dst++ = a2mu[*src++]; *dst++ = a2mu[*src++];
pvt->samples += in_samples; pvt->samples += in_samples;
pvt->datalen += in_samples; pvt->datalen += in_samples;
@@ -70,12 +70,12 @@ static int alawtoulaw_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
/*! \brief convert frame data and store into the buffer */ /*! \brief convert frame data and store into the buffer */
static int ulawtoalaw_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) static int ulawtoalaw_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
{ {
int i; int x = f->samples;
int in_samples = f->samples; int in_samples = f->samples;
unsigned char *src = f->data; unsigned char *src = f->data;
unsigned char *dst = (unsigned char *)pvt->outbuf + pvt->samples; unsigned char *dst = (unsigned char *)pvt->outbuf + pvt->samples;
for (i = 0; i < in_samples; i++) while (x--)
*dst++ = mu2a[*src++]; *dst++ = mu2a[*src++];
pvt->samples += in_samples; pvt->samples += in_samples;
pvt->datalen += in_samples; pvt->datalen += in_samples;

8
codecs/codec_adpcm.c
View File

@@ -239,13 +239,13 @@ struct adpcm_decoder_pvt {
static int adpcmtolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) static int adpcmtolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
{ {
struct adpcm_decoder_pvt *tmp = pvt->pvt; struct adpcm_decoder_pvt *tmp = pvt->pvt;
int x; int x = f->datalen;
unsigned char *src = f->data; unsigned char *src = f->data;
int16_t *dst = (int16_t *)pvt->outbuf + pvt->samples; int16_t *dst = (int16_t *)pvt->outbuf + pvt->samples;
for (x=0; x < f->datalen; x++) { while (x--) {
*dst++ = decode((src[x] >> 4) & 0xf, &tmp->state); *dst++ = decode((*src >> 4) & 0xf, &tmp->state);
*dst++ = decode(src[x] & 0x0f, &tmp->state); *dst++ = decode(*src++ & 0x0f, &tmp->state);
} }
pvt->samples += f->samples; pvt->samples += f->samples;
pvt->datalen += 2*f->samples; pvt->datalen += 2*f->samples;

20
codecs/codec_alaw.c
View File

@@ -54,30 +54,30 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
/*! \brief decode frame into lin and fill output buffer. */ /*! \brief decode frame into lin and fill output buffer. */
static int alawtolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) static int alawtolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
{ {
int i; int i = f->samples;
unsigned char *src = f->data; unsigned char *src = f->data;
int16_t *dst = (int16_t *)pvt->outbuf; int16_t *dst = (int16_t *)pvt->outbuf + pvt->samples;
int in_samples = f->samples; int in_samples = f->samples;
int out_samples = pvt->samples;
for (i = 0; i < in_samples; i++) while (i--)
dst[out_samples++] = AST_ALAW(src[i]); *dst++ = AST_ALAW(*src++);
pvt->samples = out_samples; pvt->samples += f->samples;
pvt->datalen += in_samples * 2; /* 2 bytes/sample */ pvt->datalen += f->samples * 2; /* 2 bytes/sample */
return 0; return 0;
} }
/*! \brief convert and store input samples in output buffer */ /*! \brief convert and store input samples in output buffer */
static int lintoalaw_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) static int lintoalaw_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
{ {
int i; int i = f->samples;
char *dst = pvt->outbuf + pvt->samples; char *dst = pvt->outbuf + pvt->samples;
int16_t *src = f->data; int16_t *src = f->data;
int in_samples = f->samples; int in_samples = f->samples;
for (i = 0; i < in_samples; i++) while (i--)
*dst++ = AST_LIN2A(src[i]); *dst++ = AST_LIN2A(*src++);
pvt->samples += in_samples; pvt->samples += in_samples;
pvt->datalen += in_samples; /* 1 byte/sample */ pvt->datalen += in_samples; /* 1 byte/sample */
return 0; return 0;

17
codecs/codec_ulaw.c
View File

@@ -54,17 +54,17 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
/*! \brief convert and store samples in outbuf */ /*! \brief convert and store samples in outbuf */
static int ulawtolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) static int ulawtolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
{ {
int i; int i = f->samples;
unsigned char *src = f->data; unsigned char *src = f->data;
int16_t *dst = (int16_t *)pvt->outbuf; int16_t *dst = (int16_t *)pvt->outbuf + pvt->samples;
int in_samples = f->samples; int in_samples = f->samples;
int out_samples = pvt->samples; int out_samples = pvt->samples;
/* convert and copy in outbuf */ /* convert and copy in outbuf */
for (i = 0; i < in_samples; i++) while (i--)
dst[out_samples++] = AST_MULAW(src[i]); *dst++ = AST_MULAW(*src++);
pvt->samples = out_samples; pvt->samples += in_samples;
pvt->datalen += in_samples * 2; /* 2 bytes/sample */ pvt->datalen += in_samples * 2; /* 2 bytes/sample */
return 0; return 0;
} }
@@ -72,13 +72,14 @@ static int ulawtolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
/*! \brief convert and store samples in outbuf */ /*! \brief convert and store samples in outbuf */
static int lintoulaw_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) static int lintoulaw_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
{ {
int i; int i = f->samples;
char *dst = pvt->outbuf + pvt->samples; char *dst = pvt->outbuf + pvt->samples;
int16_t *src = f->data; int16_t *src = f->data;
int in_samples = f->samples; int in_samples = f->samples;
for (i = 0; i < in_samples; i++) while (i--)
*dst++ = AST_LIN2MU(src[i]); *dst++ = AST_LIN2MU(*src++);
pvt->samples += in_samples; pvt->samples += in_samples;
pvt->datalen += in_samples; /* 1 byte/sample */ pvt->datalen += in_samples; /* 1 byte/sample */
return 0; return 0;