RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

aacenc: Remove unnecessary variables and scopes in the TLS. 

Originally committed as revision 23366 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Alex Converse 2010-05-28 20:42:01 +00:00
parent 82f1ffc7ba
commit 04d6a54e13
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/aaccoder.c
View File

@ -696,17 +696,13 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx,
const float *scaled = s->scoefs + start; const float *scaled = s->scoefs + start;
int bits = 0; int bits = 0;
int cb; int cb;
float mindist = INFINITY; float dist = 0.0f;
int minbits = 0;
if (sce->zeroes[w*16+g] || sce->sf_idx[w*16+g] >= 218) { if (sce->zeroes[w*16+g] || sce->sf_idx[w*16+g] >= 218) {
start += sce->ics.swb_sizes[g]; start += sce->ics.swb_sizes[g];
continue; continue;
} }
minscaler = FFMIN(minscaler, sce->sf_idx[w*16+g]); 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]); 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; sce->band_type[w*16+g] = cb;
for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) { for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) {
@ -719,13 +715,9 @@ static void search_for_quantizers_twoloop(AVCodecContext *avctx,
lambda, lambda,
INFINITY, INFINITY,
&b); &b);
bb += b; bits += b;
} }
mindist = dist; dists[w*16+g] = (dist - bits) / lambda;
minbits = bb;
}
dists[w*16+g] = (mindist - minbits) / lambda;
bits = minbits;
if (prev != -1) { if (prev != -1) {
bits += ff_aac_scalefactor_bits[sce->sf_idx[w*16+g] - prev + SCALE_DIFF_ZERO]; bits += ff_aac_scalefactor_bits[sce->sf_idx[w*16+g] - prev + SCALE_DIFF_ZERO];
} }