From 508f092a783f7d305d1e9938c953e375139e2cba Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Wed, 24 Mar 2010 17:09:21 +0000 Subject: aacenc: Merge quantize_band_cost() with quantize_and_encode_band(). If these two functions aren't matched results may be unexpected. Originally committed as revision 22655 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/aaccoder.c | 144 +++++++++++--------------------------------------- 1 file changed, 30 insertions(+), 114 deletions(-) (limited to 'libavcodec/aaccoder.c') diff --git a/libavcodec/aaccoder.c b/libavcodec/aaccoder.c index 0a51aa7759..6eb28b1e76 100644 --- a/libavcodec/aaccoder.c +++ b/libavcodec/aaccoder.c @@ -100,7 +100,8 @@ static const uint8_t aac_cb_maxval[12] = {0, 1, 1, 2, 2, 4, 4, 7, 7, 12, 12, 16} * * @return quantization distortion */ -static float quantize_band_cost(struct AACEncContext *s, const float *in, +static float quantize_and_encode_band_cost(struct AACEncContext *s, + PutBitContext *pb, const float *in, const float *scaled, int size, int scale_idx, int cb, const float lambda, const float uplim, int *bits) @@ -130,6 +131,10 @@ static float quantize_band_cost(struct AACEncContext *s, const float *in, offs[0] = 1; for (i = 1; i < dim; i++) offs[i] = offs[i-1]*range; + if (!scaled) { + abs_pow34_v(s->scoefs, in, size); + scaled = s->scoefs; + } quantize_bands(s->qcoefs, in, scaled, size, Q34, !IS_CODEBOOK_UNSIGNED(cb), maxval); #endif /* USE_REALLY_FULL_SEARCH */ for (i = 0; i < size; i += dim) { @@ -168,6 +173,7 @@ static float quantize_band_cost(struct AACEncContext *s, const float *in, for (j = 0; j < ff_aac_spectral_sizes[cb-1]; j++, vec += dim) { float rd = 0.0f; int curbits = ff_aac_spectral_bits[cb-1][j]; + int curidx = j; #endif /* USE_REALLY_FULL_SEARCH */ if (IS_CODEBOOK_UNSIGNED(cb)) { for (k = 0; k < dim; k++) { @@ -203,7 +209,7 @@ static float quantize_band_cost(struct AACEncContext *s, const float *in, rd = rd * lambda + curbits; if (rd < mincost) { mincost = rd; - minidx = j; + minidx = curidx; minbits = curbits; } } @@ -211,117 +217,7 @@ static float quantize_band_cost(struct AACEncContext *s, const float *in, resbits += minbits; if (cost >= uplim) return uplim; - } - - if (bits) - *bits = resbits; - return cost; -} - -static void quantize_and_encode_band(struct AACEncContext *s, PutBitContext *pb, - const float *in, int size, int scale_idx, - int cb, const float lambda) -{ - const float IQ = ff_aac_pow2sf_tab[200 + scale_idx - SCALE_ONE_POS + SCALE_DIV_512]; - const float Q = ff_aac_pow2sf_tab[200 - scale_idx + SCALE_ONE_POS - SCALE_DIV_512]; - const float CLIPPED_ESCAPE = 165140.0f*IQ; - const int dim = (cb < FIRST_PAIR_BT) ? 4 : 2; - int i, j, k; -#ifndef USE_REALLY_FULL_SEARCH - const float Q34 = sqrtf(Q * sqrtf(Q)); - const int range = aac_cb_range[cb]; - const int maxval = aac_cb_maxval[cb]; - int offs[4]; - float *scaled = s->scoefs; -#endif /* USE_REALLY_FULL_SEARCH */ - -//START_TIMER - if (!cb) - return; - -#ifndef USE_REALLY_FULL_SEARCH - offs[0] = 1; - for (i = 1; i < dim; i++) - offs[i] = offs[i-1]*range; - abs_pow34_v(scaled, in, size); - quantize_bands(s->qcoefs, in, scaled, size, Q34, !IS_CODEBOOK_UNSIGNED(cb), maxval); -#endif /* USE_REALLY_FULL_SEARCH */ - for (i = 0; i < size; i += dim) { - float mincost; - int minidx = 0; - int minbits = 0; - const float *vec; -#ifndef USE_REALLY_FULL_SEARCH - int (*quants)[2] = &s->qcoefs[i]; - mincost = 0.0f; - for (j = 0; j < dim; j++) - mincost += in[i+j]*in[i+j]; - minidx = IS_CODEBOOK_UNSIGNED(cb) ? 0 : 40; - minbits = ff_aac_spectral_bits[cb-1][minidx]; - mincost = mincost * lambda + minbits; - for (j = 0; j < (1<= CLIPPED_ESCAPE) { - di = t - CLIPPED_ESCAPE; - curbits += 21; - } else { - int c = av_clip(quant(t, Q), 0, 8191); - di = t - c*cbrtf(c)*IQ; - curbits += av_log2(c)*2 - 4 + 1; - } - } else { - di = t - vec[k]*IQ; - } - if (vec[k] != 0.0f) - curbits++; - rd += di*di; - } - } else { - for (k = 0; k < dim; k++) { - float di = in[i+k] - vec[k]*IQ; - rd += di*di; - } - } - rd = rd * lambda + curbits; - if (rd < mincost) { - mincost = rd; - minidx = curidx; - minbits = curbits; - } - } + if (pb) { put_bits(pb, ff_aac_spectral_bits[cb-1][minidx], ff_aac_spectral_codes[cb-1][minidx]); if (IS_CODEBOOK_UNSIGNED(cb)) for (j = 0; j < dim; j++) @@ -338,8 +234,28 @@ static void quantize_and_encode_band(struct AACEncContext *s, PutBitContext *pb, } } } + } } -//STOP_TIMER("quantize_and_encode") + + if (bits) + *bits = resbits; + return cost; +} +static float quantize_band_cost(struct AACEncContext *s, const float *in, + const float *scaled, int size, int scale_idx, + int cb, const float lambda, const float uplim, + int *bits) +{ + return quantize_and_encode_band_cost(s, NULL, in, scaled, size, scale_idx, + cb, lambda, uplim, bits); +} + +static void quantize_and_encode_band(struct AACEncContext *s, PutBitContext *pb, + const float *in, int size, int scale_idx, + int cb, const float lambda) +{ + quantize_and_encode_band_cost(s, pb, in, NULL, size, scale_idx, cb, lambda, + INFINITY, NULL); } /** -- cgit v1.2.3