[FFmpeg-cvslog] r23367 - trunk/libavcodec/aaccoder.c
alexc
subversion
Fri May 28 22:45:35 CEST 2010
Author: alexc
Date: Fri May 28 22:45:35 2010
New Revision: 23367
Log:
Cosmetics: whitespace
Modified:
trunk/libavcodec/aaccoder.c
Modified: trunk/libavcodec/aaccoder.c
==============================================================================
--- trunk/libavcodec/aaccoder.c Fri May 28 22:42:01 2010 (r23366)
+++ trunk/libavcodec/aaccoder.c Fri May 28 22:45:35 2010 (r23367)
@@ -580,7 +580,7 @@ static void search_for_quantizers_anmr(A
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(A
}
} 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_twoloo
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];
More information about the ffmpeg-cvslog
mailing list