diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-01-11 15:44:04 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2004-01-11 15:44:04 +0000 |
| commit | ba65efaad16ddd1347de7af98f9494cee7a39419 (patch) | |
| tree | 630d2e9b4581f45cbe85815ec881705be9cc045b /src/libfaad/is.c | |
| parent | 14019fd4a433078fb4466e910cd432489dd60bbc (diff) | |
| download | xine-lib-ba65efaad16ddd1347de7af98f9494cee7a39419.tar.gz xine-lib-ba65efaad16ddd1347de7af98f9494cee7a39419.tar.bz2 | |
the faad project accepted a huge compiler warning patch I sent them,
merging their CVS back to our copy
everyone please check, if your AAC samples still work
CVS patchset: 6024
CVS date: 2004/01/11 15:44:04
Diffstat (limited to 'src/libfaad/is.c')
| -rw-r--r-- | src/libfaad/is.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/libfaad/is.c b/src/libfaad/is.c index 3437d712a..f410ef107 100644 --- a/src/libfaad/is.c +++ b/src/libfaad/is.c @@ -1,6 +1,6 @@ /* ** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding -** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com +** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com ** ** This program is free software; you can redistribute it and/or modify ** it under the terms of the GNU General Public License as published by @@ -22,7 +22,7 @@ ** Commercial non-GPL licensing of this software is possible. ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com. ** -** $Id: is.c,v 1.3 2003/12/30 02:00:10 miguelfreitas Exp $ +** $Id: is.c,v 1.4 2004/01/11 15:44:05 mroi Exp $ **/ #include "common.h" @@ -47,7 +47,7 @@ void is_decode(ic_stream *ics, ic_stream *icsr, real_t *l_spec, real_t *r_spec, uint16_t frame_len) { uint8_t g, sfb, b; - uint16_t i, k; + uint16_t i; #ifndef FIXED_POINT real_t scale; #else @@ -84,18 +84,17 @@ void is_decode(ic_stream *ics, ic_stream *icsr, real_t *l_spec, real_t *r_spec, do not touch left channel */ for (i = icsr->swb_offset[sfb]; i < icsr->swb_offset[sfb+1]; i++) { - k = (group*nshort)+i; #ifndef FIXED_POINT - r_spec[k] = MUL_R(l_spec[k], scale); + r_spec[(group*nshort)+i] = MUL_R(l_spec[(group*nshort)+i], scale); #else if (exp < 0) - r_spec[k] = l_spec[k] << -exp; + r_spec[(group*nshort)+i] = l_spec[(group*nshort)+i] << -exp; else - r_spec[k] = l_spec[k] >> exp; - r_spec[k] = MUL_C(r_spec[k], pow05_table[frac + 3]); + r_spec[(group*nshort)+i] = l_spec[(group*nshort)+i] >> exp; + r_spec[(group*nshort)+i] = MUL_C(r_spec[(group*nshort)+i], pow05_table[frac + 3]); #endif if (is_intensity(icsr, g, sfb) != invert_intensity(ics, g, sfb)) - r_spec[k] = -r_spec[k]; + r_spec[(group*nshort)+i] = -r_spec[(group*nshort)+i]; } } } |