diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-11 03:37:19 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-01-11 03:37:19 +0000 |
| commit | 560327b0ecaa7760179a7e6f89c110afb47174d5 (patch) | |
| tree | 0dad1738e7ed3f7b28fef1c905f0652b623db97e /codecs/codec_g722.c | |
| parent | a8ec4ca20217748203fc7f8c541cf4d980bcda61 (diff) | |
- Fix the last set of places where incorrect assumptions were made about the
sample length with g722. It is _2_ samples per byte, not 1. This was all
over the place, and I believed it, and it is what caused me to take so long
to figure out what was broken.
- Update copyright information on codec_g722.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@98081 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs/codec_g722.c')
| -rw-r--r-- | codecs/codec_g722.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/codecs/codec_g722.c b/codecs/codec_g722.c index ac0b179f1..b8df7b76b 100644 --- a/codecs/codec_g722.c +++ b/codecs/codec_g722.c @@ -1,9 +1,10 @@ /* * Asterisk -- An open source telephony toolkit. * - * Copyright (C) 1999 - 2006, Digium, Inc. + * Copyright (C) 1999 - 2008, Digium, Inc. * * Matthew Fredrickson <creslin@digium.com> + * Russell Bryant <russell@digium.com> * * Special thanks to Steve Underwood for the implementation * and for doing the 8khz<->g.722 direct translation code. @@ -23,6 +24,9 @@ * * \brief codec_g722.c - translate between signed linear and ITU G.722-64kbps * + * \author Matthew Fredrickson <creslin@digium.com> + * \author Russell Bryant <russell@digium.com> + * * \arg http://soft-switch.org/downloads/non-gpl-bits.tgz * \arg http://lists.digium.com/pipermail/asterisk-dev/2006-September/022866.html * @@ -162,7 +166,7 @@ static struct ast_frame *g722tolin_sample(void) .frametype = AST_FRAME_VOICE, .subclass = AST_FORMAT_G722, .datalen = sizeof(g722_slin_ex), - .samples = sizeof(g722_slin_ex), + .samples = sizeof(g722_slin_ex) * 2, .src = __PRETTY_FUNCTION__, .data = g722_slin_ex, }; @@ -176,7 +180,7 @@ static struct ast_frame *g722tolin16_sample(void) .frametype = AST_FRAME_VOICE, .subclass = AST_FORMAT_G722, .datalen = sizeof(slin_g722_ex), - .samples = sizeof(slin_g722_ex), + .samples = sizeof(slin_g722_ex) * 2, .src = __PRETTY_FUNCTION__, .data = slin_g722_ex, }; @@ -233,7 +237,7 @@ static struct ast_translator lintog722 = { .framein = lintog722_framein, .sample = lintog722_sample, .desc_size = sizeof(struct g722_encoder_pvt), - .buffer_samples = BUFFER_SAMPLES, + .buffer_samples = BUFFER_SAMPLES * 2, .buf_size = BUFFER_SAMPLES, }; @@ -258,7 +262,7 @@ static struct ast_translator lin16tog722 = { .framein = lin16tog722_framein, .sample = lin16tog722_sample, .desc_size = sizeof(struct g722_encoder_pvt), - .buffer_samples = BUFFER_SAMPLES, + .buffer_samples = BUFFER_SAMPLES * 2, .buf_size = BUFFER_SAMPLES, }; |