Mercurial > libavcodec.hg

changeset 11792:a211c41465f3 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
aacenc: Remove unnecessary variables and scopes in the TLS.
author alexc
date Fri, 28 May 2010 20:42:01 +0000
parents 51abd780bda6
children 9a13275c05c4
files aaccoder.c
diffstat 1 files changed, 3 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/aaccoder.c	Fri May 28 20:14:14 2010 +0000
+++ b/aaccoder.c	Fri May 28 20:42:01 2010 +0000
@@ -696,17 +696,13 @@
                     const float *scaled = s->scoefs + start;
                     int bits = 0;
                     int cb;
-                    float mindist = INFINITY;
-                    int minbits = 0;
+                    float dist = 0.0f;
 
                     if (sce->zeroes[w*16+g] || sce->sf_idx[w*16+g] >= 218) {
                         start += sce->ics.swb_sizes[g];
                         continue;
                     }
                     minscaler = FFMIN(minscaler, sce->sf_idx[w*16+g]);
-                    {
-                        float dist = 0.0f;
-                        int bb = 0;
                         cb = find_min_book(find_max_val(sce->ics.group_len[w], sce->ics.swb_sizes[g], scaled), sce->sf_idx[w*16+g]);
                         sce->band_type[w*16+g] = cb;
                         for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) {
@@ -719,13 +715,9 @@
                                                        lambda,
                                                        INFINITY,
                                                        &b);
-                            bb += b;
+                            bits += b;
                         }
-                            mindist = dist;
-                            minbits = bb;
-                    }
-                    dists[w*16+g] = (mindist - minbits) / lambda;
-                    bits = minbits;
+                    dists[w*16+g] = (dist - bits) / lambda;
                     if (prev != -1) {
                         bits += ff_aac_scalefactor_bits[sce->sf_idx[w*16+g] - prev + SCALE_DIFF_ZERO];
                     }