---
libavcodec/adxenc.c | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/libavcodec/adxenc.c b/libavcodec/adxenc.c
index 43f7801..bd3d093 100644
--- a/libavcodec/adxenc.c
+++ b/libavcodec/adxenc.c
@@ -34,7 +34,7 @@
*/
static void adx_encode(ADXContext *c, uint8_t *adx, const int16_t *wav,
- ADXChannelState *prev)
+ ADXChannelState *prev, int channels)
{
PutBitContext pb;
int scale;
@@ -46,10 +46,10 @@ static void adx_encode(ADXContext *c, uint8_t *adx, const
int16_t *wav,
s1 = prev->s1;
s2 = prev->s2;
- for (i = 0; i < 32; i++) {
+ for (i = 0; i < 32 * channels; i += channels) {
s0 = wav[i];
d = ((s0 << COEFF_BITS) - c->coeff[0] * s1 - c->coeff[1] * s2) >>
COEFF_BITS;
- data[i] = d;
+ data[i / channels] = d;
if (max < d)
max = d;
if (min > d)
@@ -138,23 +138,15 @@ static int adx_encode_frame(AVCodecContext *avctx,
uint8_t *frame,
if (avctx->channels == 1) {
while (rest >= 32) {
- adx_encode(c, dst, samples, c->prev);
+ adx_encode(c, dst, samples, c->prev, avctx->channels);
dst += 18;
samples += 32;
rest -= 32;
}
} else {
while (rest >= 32*2) {
- int16_t tmpbuf[32*2];
- int i;
-
- for (i = 0; i < 32; i++) {
- tmpbuf[i ] = samples[i*2 ];
- tmpbuf[i+32] = samples[i*2+1];
- }
-
- adx_encode(c, dst, tmpbuf, c->prev );
- adx_encode(c, dst + 18, tmpbuf + 32, c->prev + 1);
+ adx_encode(c, dst, samples, c->prev, avctx->channels);
+ adx_encode(c, dst + 18, samples + 1, c->prev + 1, avctx->channels);
dst += 18*2;
samples += 32*2;
rest -= 32*2;
--
1.7.1
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
