diff options
| author | Alex Converse <alex.converse@gmail.com> | 2010-05-28 20:45:35 +0000 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2010-05-28 20:45:35 +0000 |
| commit | 911fbc452bd4f4d9563dee5d9759f054f76ef33a (patch) | |
| tree | c0efd5608ded0f542d707ad02d2a2d5976166a88 /libavcodec/aaccoder.c | |
| parent | 04d6a54e13e2ac75cd0fca365c72c548d519fc0b (diff) | |
Cosmetics: whitespace
Originally committed as revision 23367 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/aaccoder.c')
| -rw-r--r-- | libavcodec/aaccoder.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libavcodec/aaccoder.c b/libavcodec/aaccoder.c index ebbfb1ea31..1af09d4d7d 100644 --- a/libavcodec/aaccoder.c +++ b/libavcodec/aaccoder.c @@ -580,7 +580,7 @@ static void search_for_quantizers_anmr(AVCodecContext *avctx, AACEncContext *s, for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) { FFPsyBand *band = &s->psy.psy_bands[s->cur_channel*PSY_MAX_BANDS+(w+w2)*16+g]; dist += quantize_band_cost(s, coefs + w2*128, s->scoefs + start + w2*128, sce->ics.swb_sizes[g], - q + q0, cb, lambda / band->threshold, INFINITY, NULL); + q + q0, cb, lambda / band->threshold, INFINITY, NULL); } minrd = FFMIN(minrd, dist); @@ -596,8 +596,8 @@ static void search_for_quantizers_anmr(AVCodecContext *avctx, AACEncContext *s, } } else { for (q = 0; q < q1 - q0; q++) { - paths[idx][q].cost = paths[idx - 1][q].cost + 1; - paths[idx][q].prev = q; + paths[idx][q].cost = paths[idx - 1][q].cost + 1; + paths[idx][q].prev = q; } } sce->zeroes[w*16+g] = !nz; @@ -703,20 +703,20 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx, 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, - scaled + w2*128, - sce->ics.swb_sizes[g], - sce->sf_idx[w*16+g], - cb, - lambda, - INFINITY, - &b); - bits += b; - } + 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, + scaled + w2*128, + sce->ics.swb_sizes[g], + 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]; |