comparison aaccoder.c @ 11792:a211c41465f3 libavcodec

aacenc: Remove unnecessary variables and scopes in the TLS.

11791:51abd780bda6

                for (g = 0;  g < sce->ics.num_swb; g++) {
                    const float *coefs = sce->coeffs + start;
                    const float *scaled = s->scoefs + start;
                    int bits = 0;
                    int cb;
                    float mindist = INFINITY;
                    int minbits = 0;

                    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++) {
                            int b;
                            dist += quantize_band_cost(s, coefs + w2*128,

                                                       sce->sf_idx[w*16+g],
                                                       cb,
                                                       lambda,
                                                       INFINITY,
                                                       &b);
                            bb += b;
                        }
                            mindist = dist;
                            minbits = bb;
                    }
                    dists[w*16+g] = (mindist - minbits) / lambda;
                    bits = minbits;
                    if (prev != -1) {
                        bits += ff_aac_scalefactor_bits[sce->sf_idx[w*16+g] - prev + SCALE_DIFF_ZERO];
                    }
                    tbits += bits;
                    start += sce->ics.swb_sizes[g];

11792:a211c41465f3

                for (g = 0;  g < sce->ics.num_swb; g++) {
                    const float *coefs = sce->coeffs + start;
                    const float *scaled = s->scoefs + start;
                    int bits = 0;
                    int cb;
                    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]);
                        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++) {
                            int b;
                            dist += quantize_band_cost(s, coefs + w2*128,

                                                       sce->sf_idx[w*16+g],
                                                       cb,
                                                       lambda,
                                                       INFINITY,
                                                       &b);
                            bits += b;
                        }
                    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];
                    }
                    tbits += bits;
                    start += sce->ics.swb_sizes[g];