aboutsummaryrefslogtreecommitdiffstats
path: root/codecs/codec_ulaw.c
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-05-20 13:37:11 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2006-05-20 13:37:11 +0000
commite92fd1991763436e32eb2ab5642eba6bfc51d185 (patch)
tree2c14f6bf54ccea719ac4b6cce89ff8633f3ac5fd /codecs/codec_ulaw.c
parent27c5f21d71c3a6b55066375583d18b00dd69fffb (diff)
add some code optimizations, see the report for an explanation
(issue #7105, Mithraen) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@29018 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs/codec_ulaw.c')
-rw-r--r--codecs/codec_ulaw.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c
index 41eb5b308..d4f753304 100644
--- a/codecs/codec_ulaw.c
+++ b/codecs/codec_ulaw.c
@@ -54,17 +54,17 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
/*! \brief convert and store samples in outbuf */
static int ulawtolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
{
- int i;
+ int i = f->samples;
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 out_samples = pvt->samples;
/* convert and copy in outbuf */
- for (i = 0; i < in_samples; i++)
- dst[out_samples++] = AST_MULAW(src[i]);
+ while (i--)
+ *dst++ = AST_MULAW(*src++);
- pvt->samples = out_samples;
+ pvt->samples += in_samples;
pvt->datalen += in_samples * 2; /* 2 bytes/sample */
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 */
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;
int16_t *src = f->data;
int in_samples = f->samples;
- for (i = 0; i < in_samples; i++)
- *dst++ = AST_LIN2MU(src[i]);
+ while (i--)
+ *dst++ = AST_LIN2MU(*src++);
+
pvt->samples += in_samples;
pvt->datalen += in_samples; /* 1 byte/sample */
return 0;