From b88c06b8b5883ba65617573bec1423dcbfdd909a Mon Sep 17 00:00:00 2001
From: Russell Bryant <russell@russellbryant.com>
Date: Sat, 20 May 2006 13:37:11 +0000
Subject: add some code optimizations, see the report for an explanation (issue
 #7105, Mithraen)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@29018 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 codecs/codec_a_mu.c  |  8 ++++----
 codecs/codec_adpcm.c |  8 ++++----
 codecs/codec_alaw.c  | 20 ++++++++++----------
 codecs/codec_ulaw.c  | 17 +++++++++--------
 4 files changed, 27 insertions(+), 26 deletions(-)

(limited to 'codecs')

diff --git a/codecs/codec_a_mu.c b/codecs/codec_a_mu.c
index 6ab79be61..f1b35299a 100644
--- a/codecs/codec_a_mu.c
+++ b/codecs/codec_a_mu.c
@@ -55,12 +55,12 @@ static unsigned char a2mu[256];
 /*! \brief convert frame data and store into the buffer */
 static int alawtoulaw_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
 {
-	int i;
+	int x = f->samples;
 	int in_samples = f->samples;
 	unsigned char *src = f->data;
 	unsigned char *dst = (unsigned char *)pvt->outbuf + pvt->samples;
 
-	for (i = 0; i < in_samples; i++)
+	while (x--)
 		*dst++ = a2mu[*src++];
 	pvt->samples += 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 */
 static int ulawtoalaw_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
 {
-	int i;
+	int x = f->samples;
 	int in_samples = f->samples;
 	unsigned char *src = f->data;
 	unsigned char *dst = (unsigned char *)pvt->outbuf + pvt->samples;
 
-	for (i = 0; i < in_samples; i++)
+	while (x--)
 		*dst++ = mu2a[*src++];
 	pvt->samples += in_samples;
 	pvt->datalen += in_samples;
diff --git a/codecs/codec_adpcm.c b/codecs/codec_adpcm.c
index e9ee5b35d..80ec375f8 100644
--- a/codecs/codec_adpcm.c
+++ b/codecs/codec_adpcm.c
@@ -239,13 +239,13 @@ struct adpcm_decoder_pvt {
 static int adpcmtolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f)
 {
 	struct adpcm_decoder_pvt *tmp = pvt->pvt;
-	int x;
+	int x = f->datalen;
 	unsigned char *src = f->data;
 	int16_t *dst = (int16_t *)pvt->outbuf + pvt->samples;
 
-	for (x=0; x < f->datalen; x++) {
-		*dst++ = decode((src[x] >> 4) & 0xf, &tmp->state);
-		*dst++ = decode(src[x] & 0x0f, &tmp->state);
+	while (x--) {
+		*dst++ = decode((*src >> 4) & 0xf, &tmp->state);
+		*dst++ = decode(*src++ & 0x0f, &tmp->state);
 	}
 	pvt->samples += f->samples;
 	pvt->datalen += 2*f->samples;
diff --git a/codecs/codec_alaw.c b/codecs/codec_alaw.c
index 8ca185f75..1e99ac9ee 100644
--- a/codecs/codec_alaw.c
+++ b/codecs/codec_alaw.c
@@ -54,30 +54,30 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 /*! \brief decode frame into lin and fill output buffer. */
 static int alawtolin_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;
 	
-	for (i = 0; i < in_samples; i++)
-		dst[out_samples++] = AST_ALAW(src[i]);
+	while (i--)
+		*dst++ = AST_ALAW(*src++);
 
-	pvt->samples = out_samples;
-	pvt->datalen += in_samples * 2;	/* 2 bytes/sample */
+	pvt->samples += f->samples;
+	pvt->datalen += f->samples * 2;	/* 2 bytes/sample */
 	return 0;
 }
 
 /*! \brief convert and store input samples in output buffer */
 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;
 	int16_t *src = f->data;
 	int in_samples = f->samples;
 
-	for (i = 0; i < in_samples; i++) 
-		*dst++ = AST_LIN2A(src[i]);
+	while (i--) 
+		*dst++ = AST_LIN2A(*src++);
+
 	pvt->samples += in_samples;
 	pvt->datalen += in_samples;	/* 1 byte/sample */
 	return 0;
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;
-- 
cgit v1.2.3