Mercurial > libavcodec.hg

comparison aaccoder.c @ 11769:847502a2f850 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix declaration after statement
author alexc
date Tue, 25 May 2010 23:25:29 +0000
parents e9c024d542f4
children a211c41465f3
comparison
equal deleted inserted replaced
11768:b02a8a91e27d 11769:847502a2f850
564 } 564 }
565 } 565 }
566 if (nz) { 566 if (nz) {
567 int minscale, maxscale; 567 int minscale, maxscale;
568 float minrd = INFINITY; 568 float minrd = INFINITY;
569 float maxval;
569 //minimum scalefactor index is when minimum nonzero coefficient after quantizing is not clipped 570 //minimum scalefactor index is when minimum nonzero coefficient after quantizing is not clipped
570 minscale = av_clip_uint8(log2(qmin)*4 - 69 + SCALE_ONE_POS - SCALE_DIV_512); 571 minscale = av_clip_uint8(log2(qmin)*4 - 69 + SCALE_ONE_POS - SCALE_DIV_512);
571 //maximum scalefactor index is when maximum coefficient after quantizing is still not zero 572 //maximum scalefactor index is when maximum coefficient after quantizing is still not zero
572 maxscale = av_clip_uint8(log2(qmax)*4 + 6 + SCALE_ONE_POS - SCALE_DIV_512); 573 maxscale = av_clip_uint8(log2(qmax)*4 + 6 + SCALE_ONE_POS - SCALE_DIV_512);
573 minscale = av_clip(minscale - q0, 0, TRELLIS_STATES - 1); 574 minscale = av_clip(minscale - q0, 0, TRELLIS_STATES - 1);
574 maxscale = av_clip(maxscale - q0, 0, TRELLIS_STATES); 575 maxscale = av_clip(maxscale - q0, 0, TRELLIS_STATES);
575 float maxval = find_max_val(sce->ics.group_len[w], sce->ics.swb_sizes[g], s->scoefs+start); 576 maxval = find_max_val(sce->ics.group_len[w], sce->ics.swb_sizes[g], s->scoefs+start);
576 for (q = minscale; q < maxscale; q++) { 577 for (q = minscale; q < maxscale; q++) {
577 float dist = 0; 578 float dist = 0;
578 int cb = find_min_book(maxval, sce->sf_idx[w*16+g]); 579 int cb = find_min_book(maxval, sce->sf_idx[w*16+g]);
579 for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) { 580 for (w2 = 0; w2 < sce->ics.group_len[w]; w2++) {
580 FFPsyBand *band = &s->psy.psy_bands[s->cur_channel*PSY_MAX_BANDS+(w+w2)*16+g]; 581 FFPsyBand *band = &s->psy.psy_bands[s->cur_channel*PSY_MAX_BANDS+(w+w2)*16+g];