From: Måns Rullgård <mans@mansr.com>
Date: Wed, 23 Sep 2009 13:52:53 +0000 (+0000)
Subject: AAC: minor simplification in PNS decoding
X-Git-Tag: v0.6~3189
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b418a6ca7e34c7788ab172f9e8a7b39cfac2fda2;p=platform%2Fupstream%2Flibav.git

AAC: minor simplification in PNS decoding

Originally committed as revision 19999 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/aac.c b/libavcodec/aac.c
index 0b8922f..235cce5 100644
--- a/libavcodec/aac.c
+++ b/libavcodec/aac.c
@@ -860,16 +860,16 @@ static int decode_spectrum_and_dequant(AACContext *ac, float coef[1024],
             } else if (cur_band_type == NOISE_BT) {
                 for (group = 0; group < ics->group_len[g]; group++) {
                     float scale;
-                    float band_energy = 0;
+                    float band_energy;
                     float *cf = coef + group * 128 + offsets[i];
                     int len = offsets[i+1] - offsets[i];
 
-                    for (k = offsets[i]; k < offsets[i + 1]; k++) {
+                    for (k = 0; k < len; k++) {
                         ac->random_state  = lcg_random(ac->random_state);
-                        coef[group * 128 + k] = ac->random_state;
+                        cf[k] = ac->random_state;
                     }
 
-                    band_energy += ac->dsp.scalarproduct_float(cf, cf, len);
+                    band_energy = ac->dsp.scalarproduct_float(cf, cf, len);
                     scale = sf[idx] / sqrtf(band_energy);
                     ac->dsp.vector_fmul_scalar(cf, cf, scale, len);
                 }