diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-23 22:57:03 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-23 22:57:03 +0000 |
commit | fba1ee583a3e223b892fe08500010b919d8c27fe (patch) | |
tree | fb617ec24d712619b0a3b4a3bed80027ed473e39 /codecs | |
parent | d24bbad05e440bccb2607cef6a726e749571638d (diff) |
further codec module optimization based on codec_alaw changes by rizzo
(issue #7190, Mithraen)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@29880 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
-rw-r--r-- | codecs/codec_a_mu.c | 14 | ||||
-rw-r--r-- | codecs/codec_ulaw.c | 12 |
2 files changed, 14 insertions, 12 deletions
diff --git a/codecs/codec_a_mu.c b/codecs/codec_a_mu.c index f1b35299a..05dbe5c73 100644 --- a/codecs/codec_a_mu.c +++ b/codecs/codec_a_mu.c @@ -56,14 +56,15 @@ static unsigned char a2mu[256]; static int alawtoulaw_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) { int x = f->samples; - int in_samples = f->samples; unsigned char *src = f->data; unsigned char *dst = (unsigned char *)pvt->outbuf + pvt->samples; + pvt->samples += x; + pvt->datalen += x; + while (x--) *dst++ = a2mu[*src++]; - pvt->samples += in_samples; - pvt->datalen += in_samples; + return 0; } @@ -71,14 +72,15 @@ static int alawtoulaw_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 = f->samples; - int in_samples = f->samples; unsigned char *src = f->data; unsigned char *dst = (unsigned char *)pvt->outbuf + pvt->samples; + pvt->samples += x; + pvt->datalen += x; + while (x--) *dst++ = mu2a[*src++]; - pvt->samples += in_samples; - pvt->datalen += in_samples; + return 0; } diff --git a/codecs/codec_ulaw.c b/codecs/codec_ulaw.c index 6d66b9b6f..521b84237 100644 --- a/codecs/codec_ulaw.c +++ b/codecs/codec_ulaw.c @@ -57,14 +57,14 @@ static int ulawtolin_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) int i = f->samples; unsigned char *src = f->data; int16_t *dst = (int16_t *)pvt->outbuf + pvt->samples; - int in_samples = f->samples; + + pvt->samples += i; + pvt->datalen += i * 2; /* 2 bytes/sample */ /* convert and copy in outbuf */ while (i--) *dst++ = AST_MULAW(*src++); - pvt->samples += in_samples; - pvt->datalen += in_samples * 2; /* 2 bytes/sample */ return 0; } @@ -74,13 +74,13 @@ static int lintoulaw_framein(struct ast_trans_pvt *pvt, struct ast_frame *f) int i = f->samples; char *dst = pvt->outbuf + pvt->samples; int16_t *src = f->data; - int in_samples = f->samples; + + pvt->samples += i; + pvt->datalen += i; /* 1 byte/sample */ while (i--) *dst++ = AST_LIN2MU(*src++); - pvt->samples += in_samples; - pvt->datalen += in_samples; /* 1 byte/sample */ return 0; } |