diff options
Diffstat (limited to 'codecs/codec_ulaw.c')
-rw-r--r-- | codecs/codec_ulaw.c | 17 |
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; |