kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-05 03:40:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor code optimizations to reduce the number of times that the ast_frame

Browse Source 
and ast_trans_pvt pointers have to be dereferenced (issue #7069, Mithraen)


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@25059 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2006-05-05 21:36:17 +00:00
parent 0794168428
commit 5f856ea997
3 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
codecs/codec_a_mu.c
View File

@@ -55,28 +55,30 @@ 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 x; int i;
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 ( x = 0 ; x < f->samples; x++) for (i = 0; i < in_samples; i++)
dst[x] = a2mu[src[x]]; *dst++ = a2mu[*src++];
pvt->samples += f->samples; pvt->samples += in_samples;
pvt->datalen += f->datalen; pvt->datalen += in_samples;
return 0; return 0;
} }
/*! \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 x; int i;
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 ( x = 0 ; x < f->samples; x++) for (i = 0; i < in_samples; i++)
dst[x] = mu2a[src[x]]; *dst++ = mu2a[*src++];
pvt->samples += f->samples; pvt->samples += in_samples;
pvt->datalen += f->datalen; pvt->datalen += in_samples;
return 0; return 0;
} }

22
codecs/codec_alaw.c
View File

@@ -57,25 +57,29 @@ static int alawtolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
int i; int i;
unsigned char *src = f->data; unsigned char *src = f->data;
int16_t *dst = (int16_t *)pvt->outbuf; int16_t *dst = (int16_t *)pvt->outbuf;
int in_samples = f->samples;
int out_samples = pvt->samples;
for ( i = 0; i < f->samples; i++) for (i = 0; i < in_samples; i++)
dst[pvt->samples + i] = AST_ALAW(src[i]); dst[out_samples++] = AST_ALAW(src[i]);
pvt->samples += f->samples;
pvt->datalen += 2*f->samples; /* 2 bytes/sample */ pvt->samples = out_samples;
pvt->datalen += in_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 x; int i;
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;
for ( x = 0; x < f->samples; x++) for (i = 0; i < in_samples; i++)
*dst++ = AST_LIN2A(src[x]); *dst++ = AST_LIN2A(src[i]);
pvt->samples += f->samples; pvt->samples += in_samples;
pvt->datalen += f->samples; /* 1 byte/sample */ pvt->datalen += in_samples; /* 1 byte/sample */
return 0; return 0;
} }

22
codecs/codec_ulaw.c
View File

@@ -57,13 +57,15 @@ static int ulawtolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
int i; int i;
unsigned char *src = f->data; unsigned char *src = f->data;
int16_t *dst = (int16_t *)pvt->outbuf; int16_t *dst = (int16_t *)pvt->outbuf;
int in_samples = f->samples;
int out_samples = pvt->samples;
/* convert and copy in outbuf */ /* convert and copy in outbuf */
for (i=0; i<f->samples; i++) for (i = 0; i < in_samples; i++)
dst[pvt->samples + i] = AST_MULAW(src[i]); dst[out_samples++] = AST_MULAW(src[i]);
pvt->samples += f->samples; pvt->samples = out_samples;
pvt->datalen += 2 * f->samples; pvt->datalen += in_samples * 2; /* 2 bytes/sample */
return 0; return 0;
} }
@@ -71,12 +73,14 @@ static int ulawtolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
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;
char *dst = pvt->outbuf + pvt->samples;
int16_t *src = f->data; int16_t *src = f->data;
int in_samples = f->samples;
for (i=0 ; i < f->samples; i++) for (i = 0; i < in_samples; i++)
pvt->outbuf[pvt->samples + i] = AST_LIN2MU(src[i]); *dst++ = AST_LIN2MU(src[i]);
pvt->samples += f->samples; pvt->samples += in_samples;
pvt->datalen += f->samples; /* 1 byte/sample */ pvt->datalen += in_samples; /* 1 byte/sample */
return 0; return 0;
} }
@@ -147,7 +151,7 @@ static void parse_config(void)
{ {
struct ast_variable *var; struct ast_variable *var;
struct ast_config *cfg = ast_config_load("codecs.conf"); struct ast_config *cfg = ast_config_load("codecs.conf");
if (cfg == NULL) if (!cfg)
return; return;
for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) { for (var = ast_variable_browse(cfg, "plc"); var; var = var->next) {
if (!strcasecmp(var->name, "genericplc")) { if (!strcasecmp(var->name, "genericplc")) {