June 2009 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r4475 - in aacenc: aaccoder.c aacenc.h
by alexc 18 Jun '09

18 Jun '09

Author: alexc Date: Thu Jun 18 06:15:40 2009 New Revision: 4475 Log: Split quantize_bands into abs_pow34_v (which exponentiates a vector of coefficients) and quantize_bands (which now just quantizes and clips). Modified: aacenc/aaccoder.c aacenc/aacenc.h Modified: aacenc/aaccoder.c ============================================================================== --- aacenc/aaccoder.c Thu Jun 18 06:15:00 2009 (r4474) +++ aacenc/aaccoder.c Thu Jun 18 06:15:40 2009 (r4475) @@ -64,12 +64,12 @@ static av_always_inline int quant(float return pow(coef * Q, 0.75) + 0.4054; } -static void quantize_bands(int (*out)[2], const float* in, int size, float Q, int is_signed, int maxval) +static void quantize_bands(int (*out)[2], const float *in, const float *scaled, int size, float Q34, int is_signed, int maxval) { int i; double qc; for (i = 0; i < size; i++) { - qc = pow(fabsf(in[i]) * Q, 0.75); + qc = scaled[i] * Q34; out[i][0] = (int)FFMIN((int)qc, maxval); out[i][1] = (int)FFMIN((int)(qc + 0.4054), maxval); if (is_signed && in[i] < 0.0f) { @@ -79,6 +79,14 @@ static void quantize_bands(int (*out)[2] } } +static void abs_pow34_v(float *out, const float* in, const int size) +{ + int i; + for (i = 0; i < size; i++) { + out[i] = pow(fabsf(in[i]), 0.75); + } +} + static av_always_inline int quant2(float coef, const float Q) { return pow(coef * Q, 0.75); @@ -103,9 +111,11 @@ static float quantize_band_cost(struct A const int dim = cb < FIRST_PAIR_BT ? 4 : 2; int resbits = 0; #ifndef USE_REALLY_FULL_SEARCH + const float Q34 = pow(Q, 0.75); 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 */ if(!cb){ @@ -117,7 +127,8 @@ static float quantize_band_cost(struct A offs[0] = 1; for(i = 1; i < dim; i++) offs[i] = offs[i-1]*range; - quantize_bands(s->qcoefs, in, size, Q, !IS_CODEBOOK_UNSIGNED(cb), maxval); + 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; @@ -215,9 +226,11 @@ static void quantize_and_encode_band(str const int dim = (cb < FIRST_PAIR_BT) ? 4 : 2; int i, j, k; #ifndef USE_REALLY_FULL_SEARCH + const float Q34 = pow(Q, 0.75); 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 @@ -228,7 +241,8 @@ static void quantize_and_encode_band(str offs[0] = 1; for(i = 1; i < dim; i++) offs[i] = offs[i-1]*range; - quantize_bands(s->qcoefs, in, size, Q, !IS_CODEBOOK_UNSIGNED(cb), maxval); + 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; Modified: aacenc/aacenc.h ============================================================================== --- aacenc/aacenc.h Thu Jun 18 06:15:00 2009 (r4474) +++ aacenc/aacenc.h Thu Jun 18 06:15:40 2009 (r4475) @@ -65,6 +65,7 @@ typedef struct AACEncContext { int last_frame; float lambda; DECLARE_ALIGNED_16(int, qcoefs[96][2]); ///< quantized coefficients + DECLARE_ALIGNED_16(float, scoefs[1024]); ///< scaled coefficients } AACEncContext; #endif /* AVCODEC_AACENC_H */

1 0

[soc]: r4474 - rtmp/rtmpdec.c
by kostya 18 Jun '09

18 Jun '09

Author: kostya Date: Thu Jun 18 06:15:00 2009 New Revision: 4474 Log: Remove unneeded #define Modified: rtmp/rtmpdec.c Modified: rtmp/rtmpdec.c ============================================================================== --- rtmp/rtmpdec.c Thu Jun 18 06:14:08 2009 (r4473) +++ rtmp/rtmpdec.c Thu Jun 18 06:15:00 2009 (r4474) @@ -36,8 +36,6 @@ #include "rtmp.h" #include "rtmppkt.h" -#define DEBUG 1 - typedef struct RTMPState { URLContext *rtmp_hd; RTMPPacketHistory rhist, whist;

1 0

[soc]: r4473 - rtmp/rtmppkt.c
by kostya 18 Jun '09

18 Jun '09

Author: kostya Date: Thu Jun 18 06:14:08 2009 New Revision: 4473 Log: Set extra field for RTMP packet with full header Modified: rtmp/rtmppkt.c Modified: rtmp/rtmppkt.c ============================================================================== --- rtmp/rtmppkt.c Thu Jun 18 05:51:25 2009 (r4472) +++ rtmp/rtmppkt.c Thu Jun 18 06:14:08 2009 (r4473) @@ -114,6 +114,8 @@ int rtmp_packet_read(AVFormatContext *ct } } rtmp_packet_create(p, stream_id, type, type, data_size); + if (hdr == RTMP_PS_TWELVEBYTES) + p->extra = AV_RL32(buf); while (data_size > 0) { int toread = FFMIN(data_size, hist->chunk_size[stream_id]); int r;

1 0

[soc]: r4472 - aacenc/aaccoder.c
by alexc 18 Jun '09

18 Jun '09

Author: alexc Date: Thu Jun 18 05:51:25 2009 New Revision: 4472 Log: Fix USE_REALLY_FULL_SEARCH after the last commit Modified: aacenc/aaccoder.c Modified: aacenc/aaccoder.c ============================================================================== --- aacenc/aaccoder.c Thu Jun 18 05:24:45 2009 (r4471) +++ aacenc/aaccoder.c Thu Jun 18 05:51:25 2009 (r4472) @@ -117,8 +117,8 @@ static float quantize_band_cost(struct A offs[0] = 1; for(i = 1; i < dim; i++) offs[i] = offs[i-1]*range; -#endif /* USE_REALLY_FULL_SEARCH */ quantize_bands(s->qcoefs, in, size, Q, !IS_CODEBOOK_UNSIGNED(cb), maxval); +#endif /* USE_REALLY_FULL_SEARCH */ for(i = 0; i < size; i += dim){ float mincost; int minidx = 0; @@ -228,8 +228,8 @@ static void quantize_and_encode_band(str offs[0] = 1; for(i = 1; i < dim; i++) offs[i] = offs[i-1]*range; -#endif /* USE_REALLY_FULL_SEARCH */ quantize_bands(s->qcoefs, in, size, Q, !IS_CODEBOOK_UNSIGNED(cb), maxval); +#endif /* USE_REALLY_FULL_SEARCH */ for(i = 0; i < size; i += dim){ float mincost; int minidx = 0;

1 0

[soc]: r4471 - in aacenc: aaccoder.c aacenc.c aacenc.h
by alexc 18 Jun '09

18 Jun '09

Author: alexc Date: Thu Jun 18 05:24:45 2009 New Revision: 4471 Log: Factor out the band quantizer. Modified: aacenc/aaccoder.c aacenc/aacenc.c aacenc/aacenc.h Modified: aacenc/aaccoder.c ============================================================================== --- aacenc/aaccoder.c Thu Jun 18 05:22:18 2009 (r4470) +++ aacenc/aaccoder.c Thu Jun 18 05:24:45 2009 (r4471) @@ -64,6 +64,21 @@ static av_always_inline int quant(float return pow(coef * Q, 0.75) + 0.4054; } +static void quantize_bands(int (*out)[2], const float* in, int size, float Q, int is_signed, int maxval) +{ + int i; + double qc; + for (i = 0; i < size; i++) { + qc = pow(fabsf(in[i]) * Q, 0.75); + out[i][0] = (int)FFMIN((int)qc, maxval); + out[i][1] = (int)FFMIN((int)(qc + 0.4054), maxval); + if (is_signed && in[i] < 0.0f) { + out[i][0] = -out[i][0]; + out[i][1] = -out[i][1]; + } + } +} + static av_always_inline int quant2(float coef, const float Q) { return pow(coef * Q, 0.75); @@ -77,7 +92,7 @@ static const uint8_t aac_cb_maxval[12] = * * @return quantization distortion */ -static float quantize_band_cost(const float *in, int size, int scale_idx, int cb, +static float quantize_band_cost(struct AACEncContext *s, const float *in, int size, int scale_idx, int cb, const float lambda, const float uplim, int *bits) { const float IQ = ff_aac_pow2sf_tab[200 + scale_idx - SCALE_ONE_POS + SCALE_DIV_512]; @@ -103,22 +118,16 @@ static float quantize_band_cost(const fl for(i = 1; i < dim; i++) offs[i] = offs[i-1]*range; #endif /* USE_REALLY_FULL_SEARCH */ + quantize_bands(s->qcoefs, in, size, Q, !IS_CODEBOOK_UNSIGNED(cb), maxval); 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[4][2]; + int (*quants)[2] = &s->qcoefs[i]; mincost = 0.0f; for(j = 0; j < dim; j++){ - quants[j][0] = quant2(fabsf(in[i+j]), Q); - quants[j][1] = quant (fabsf(in[i+j]), Q); - for(k = 0; k < 2; k++){ - quants[j][k] = FFMIN(quants[j][k], maxval); - if(!IS_CODEBOOK_UNSIGNED(cb) && in[i+j] < 0.0f) - quants[j][k] = -quants[j][k]; - } mincost += in[i+j]*in[i+j]*lambda; } minidx = IS_CODEBOOK_UNSIGNED(cb) ? 0 : 40; @@ -197,7 +206,7 @@ static float quantize_band_cost(const fl return cost; } -static void quantize_and_encode_band(PutBitContext *pb, const float *in, int size, +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]; @@ -220,22 +229,16 @@ static void quantize_and_encode_band(Put for(i = 1; i < dim; i++) offs[i] = offs[i-1]*range; #endif /* USE_REALLY_FULL_SEARCH */ + quantize_bands(s->qcoefs, in, size, Q, !IS_CODEBOOK_UNSIGNED(cb), maxval); 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[4][2]; + int (*quants)[2] = &s->qcoefs[i]; mincost = 0.0f; for(j = 0; j < dim; j++){ - quants[j][0] = quant2(fabsf(in[i+j]), Q); - quants[j][1] = quant (fabsf(in[i+j]), Q); - for(k = 0; k < 2; k++){ - quants[j][k] = FFMIN(quants[j][k], maxval); - if(!IS_CODEBOOK_UNSIGNED(cb) && in[i+j] < 0.0f) - quants[j][k] = -quants[j][k]; - } mincost += in[i+j]*in[i+j]*lambda; } minidx = IS_CODEBOOK_UNSIGNED(cb) ? 0 : 40; @@ -376,7 +379,7 @@ static void encode_window_bands_info(AAC float rd = 0.0f; for(w = 0; w < group_len; w++){ FFPsyBand *band = &s->psy.psy_bands[s->cur_channel*PSY_MAX_BANDS+(win+w)*16+swb]; - rd += quantize_band_cost(sce->coeffs + start + w*128, size, + rd += quantize_band_cost(s, sce->coeffs + start + w*128, size, sce->sf_idx[(win+w)*16+swb], cb, lambda / band->threshold, INFINITY, NULL); } @@ -514,7 +517,7 @@ static void search_for_quantizers_anmr(A FFPsyBand *band = &s->psy.psy_bands[s->cur_channel*PSY_MAX_BANDS+(w+w2)*16+g]; int cb; for(cb = 0; cb <= ESC_BT; cb++){ - dists[cb] += quantize_band_cost(coefs + w2*128, sce->ics.swb_sizes[g], + dists[cb] += quantize_band_cost(s, coefs + w2*128, sce->ics.swb_sizes[g], q, cb, lambda / band->threshold, INFINITY, NULL); } } @@ -668,7 +671,7 @@ static void search_for_quantizers_twoloo int bb = 0; for(w2 = 0; w2 < sce->ics.group_len[w]; w2++){ int b; - dist += quantize_band_cost(coefs + w2*128, + dist += quantize_band_cost(s, coefs + w2*128, sce->ics.swb_sizes[g], sce->sf_idx[w*16+g], ESC_BT, @@ -837,7 +840,7 @@ static void search_for_quantizers_faac(A for(w2 = 0; w2 < sce->ics.group_len[w]; w2++){ int b; - dist += quantize_band_cost(coefs + w2*128, + dist += quantize_band_cost(s, coefs + w2*128, sce->ics.swb_sizes[g], scf, ESC_BT, @@ -946,22 +949,22 @@ static void search_for_ms(AACEncContext S[i] = sce0->coeffs[start+w2*128+i] - sce1->coeffs[start+w2*128+i]; } - dist1 += quantize_band_cost(sce0->coeffs + start + w2*128, + dist1 += quantize_band_cost(s, sce0->coeffs + start + w2*128, sce0->ics.swb_sizes[g], sce0->sf_idx[(w+w2)*16+g], sce0->band_type[(w+w2)*16+g], lambda / band0->threshold, INFINITY, NULL); - dist1 += quantize_band_cost(sce1->coeffs + start + w2*128, + dist1 += quantize_band_cost(s, sce1->coeffs + start + w2*128, sce1->ics.swb_sizes[g], sce1->sf_idx[(w+w2)*16+g], sce1->band_type[(w+w2)*16+g], lambda / band1->threshold, INFINITY, NULL); - dist2 += quantize_band_cost(M, + dist2 += quantize_band_cost(s, M, sce0->ics.swb_sizes[g], sce0->sf_idx[(w+w2)*16+g], sce0->band_type[(w+w2)*16+g], lambda / maxthr, INFINITY, NULL); - dist2 += quantize_band_cost(S, + dist2 += quantize_band_cost(s, S, sce1->ics.swb_sizes[g], sce1->sf_idx[(w+w2)*16+g], sce1->band_type[(w+w2)*16+g], Modified: aacenc/aacenc.c ============================================================================== --- aacenc/aacenc.c Thu Jun 18 05:22:18 2009 (r4470) +++ aacenc/aacenc.c Thu Jun 18 05:24:45 2009 (r4471) @@ -419,7 +419,7 @@ static void encode_spectral_coeffs(AACEn continue; } for(w2 = w; w2 < w + sce->ics.group_len[w]; w2++){ - s->coder->quantize_and_encode_band(&s->pb, sce->coeffs + start + w2*128, + s->coder->quantize_and_encode_band(s, &s->pb, sce->coeffs + start + w2*128, sce->ics.swb_sizes[i], sce->sf_idx[w*16 + i], sce->band_type[w*16 + i], Modified: aacenc/aacenc.h ============================================================================== --- aacenc/aacenc.h Thu Jun 18 05:22:18 2009 (r4470) +++ aacenc/aacenc.h Thu Jun 18 05:24:45 2009 (r4471) @@ -37,7 +37,7 @@ typedef struct AACCoefficientsEncoder{ SingleChannelElement *sce, const float lambda); void (*encode_window_bands_info)(struct AACEncContext *s, SingleChannelElement *sce, int win, int group_len, const float lambda); - void (*quantize_and_encode_band)(PutBitContext *pb, const float *in, int size, + void (*quantize_and_encode_band)(struct AACEncContext *s, PutBitContext *pb, const float *in, int size, int scale_idx, int cb, const float lambda); void (*search_for_ms)(struct AACEncContext *s, ChannelElement *cpe, const float lambda); }AACCoefficientsEncoder; @@ -64,6 +64,7 @@ typedef struct AACEncContext { int cur_channel; int last_frame; float lambda; + DECLARE_ALIGNED_16(int, qcoefs[96][2]); ///< quantized coefficients } AACEncContext; #endif /* AVCODEC_AACENC_H */

1 0

AACEnc #if 0 block
by Alex Converse 18 Jun '09

18 Jun '09

In aaccoder.c there is a large block of code like this: #if 1 lots of code; #else similar code; #endif What is the purpose of all that else code. Are we trying to move to it? Did we move away from it and leave it behind? It makes navigating the file much more painful because it share several function names with the code that is turned on. Thanks, Alex Converse

2 4

[soc]: r4470 - aacenc/aaccoder.c
by alexc 18 Jun '09

18 Jun '09

Author: alexc Date: Thu Jun 18 05:22:18 2009 New Revision: 4470 Log: Merge the common code of the #if'd quantize_band_costs and quantize_and_encode_band pairs of functions. The USE_REALLY_FULL_SEARCH define selects the set to be used. Modified: aacenc/aaccoder.c Modified: aacenc/aaccoder.c ============================================================================== --- aacenc/aaccoder.c Wed Jun 17 01:42:47 2009 (r4469) +++ aacenc/aaccoder.c Thu Jun 18 05:22:18 2009 (r4470) @@ -64,8 +64,6 @@ static av_always_inline int quant(float return pow(coef * Q, 0.75) + 0.4054; } -#if 1 - static av_always_inline int quant2(float coef, const float Q) { return pow(coef * Q, 0.75); @@ -89,22 +87,28 @@ static float quantize_band_cost(const fl float cost = 0; const int dim = cb < FIRST_PAIR_BT ? 4 : 2; int resbits = 0; +#ifndef USE_REALLY_FULL_SEARCH const int range = aac_cb_range[cb]; const int maxval = aac_cb_maxval[cb]; int offs[4]; +#endif /* USE_REALLY_FULL_SEARCH */ if(!cb){ for(i = 0; i < size; i++) cost += in[i]*in[i]*lambda; return cost; } +#ifndef USE_REALLY_FULL_SEARCH offs[0] = 1; for(i = 1; i < dim; i++) offs[i] = offs[i-1]*range; +#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[4][2]; mincost = 0.0f; for(j = 0; j < dim; j++){ @@ -124,7 +128,6 @@ static float quantize_band_cost(const fl float rd = 0.0f; int curbits; int curidx = IS_CODEBOOK_UNSIGNED(cb) ? 0 : 40; - const float *vec; int same = 0; for(k = 0; k < dim; k++){ if((j & (1 << k)) && quants[k][0] == quants[k][1]){ @@ -138,6 +141,13 @@ static float quantize_band_cost(const fl curidx += quants[k][!!(j & (1 << k))] * offs[dim - 1 - k]; curbits = ff_aac_spectral_bits[cb-1][curidx]; vec = &ff_aac_codebook_vectors[cb-1][curidx*dim]; +#else + mincost = INFINITY; + vec = ff_aac_codebook_vectors[cb-1]; + 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]; +#endif /* USE_REALLY_FULL_SEARCH */ if(IS_CODEBOOK_UNSIGNED(cb)){ for(k = 0; k < dim; k++){ float t = fabsf(in[i+k]); @@ -193,22 +203,29 @@ static void quantize_and_encode_band(Put 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 range = aac_cb_range[cb]; - const int maxval = aac_cb_maxval[cb]; const int dim = (cb < FIRST_PAIR_BT) ? 4 : 2; int i, j, k; +#ifndef USE_REALLY_FULL_SEARCH + const int range = aac_cb_range[cb]; + const int maxval = aac_cb_maxval[cb]; int offs[4]; +#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; +#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[4][2]; mincost = 0.0f; for(j = 0; j < dim; j++){ @@ -228,7 +245,6 @@ static void quantize_and_encode_band(Put float rd = 0.0f; int curbits; int curidx = IS_CODEBOOK_UNSIGNED(cb) ? 0 : 40; - const float *vec; int same = 0; for(k = 0; k < dim; k++){ if((j & (1 << k)) && quants[k][0] == quants[k][1]){ @@ -242,6 +258,14 @@ static void quantize_and_encode_band(Put curidx += quants[k][!!(j & (1 << k))] * offs[dim - 1 - k]; curbits = ff_aac_spectral_bits[cb-1][curidx]; vec = &ff_aac_codebook_vectors[cb-1][curidx*dim]; +#else + vec = ff_aac_codebook_vectors[cb-1]; + mincost = INFINITY; + 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++){ float t = fabsf(in[i+k]); @@ -297,173 +321,9 @@ static void quantize_and_encode_band(Put } } } -} - -#else - -/** - * Calculate rate distortion cost for quantizing with given codebook - * - * @return quantization distortion - */ -static float quantize_band_cost(const float *in, int size, int scale_idx, int cb, - const float lambda, const float uplim, int *bits) -{ - const float Q = ff_aac_pow2sf_tab[200 + scale_idx - SCALE_ONE_POS + SCALE_DIV_512]; - const float IQ = 1.0/Q; - const float CLIPPED_ESCAPE = 165140.0f*Q; - int i, j, k; - float cost = 0; - const int dim = cb < FIRST_PAIR_BT ? 4 : 2; - int resbits = 0; - - if(!cb){ - for(i = 0; i < size; i++) - cost += in[i]*in[i]*lambda; - return cost; - } - for(i = 0; i < size; i += dim){ - float mincost = INFINITY; - int minidx = 0; - int minbits = 0; - const float *vec = ff_aac_codebook_vectors[cb-1]; - 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]; - if(IS_CODEBOOK_UNSIGNED(cb)){ - for(k = 0; k < dim; k++){ - float t = fabsf(in[i+k]); - float di; - //do not code with escape sequence small values - if(vec[k] == 64.0f && t < 39.0f*Q){ - rd = INFINITY; - break; - } - if(vec[k] == 64.0f){//FIXME: slow - if (t >= CLIPPED_ESCAPE) { - di = t - CLIPPED_ESCAPE; - curbits += 21; - }else{ - int c = av_clip(quant(t, IQ), 0, 8191); - di = t - c*cbrt(c)*Q; - curbits += av_log2(c)*2 - 4 + 1; - } - }else{ - di = t - vec[k]*Q; - } - if(vec[k] != 0.0f) - curbits++; - rd += di*di*lambda; - } - }else{ - for(k = 0; k < dim; k++){ - float di = in[i+k] - vec[k]*Q; - rd += di*di*lambda; - } - } - rd += curbits; - if(rd < mincost){ - mincost = rd; - minidx = j; - minbits = curbits; - } - } - cost += mincost; - resbits += minbits; - if(cost >= uplim) - return uplim; - } - - if(bits) - *bits = resbits; - return cost; -} - -/** - * Prepare coefficients for encoding. - * - * @return sum of coefficient absolute values - */ -static void quantize_and_encode_band(PutBitContext *pb, const float *in, int size, - int scale_idx, int cb, const float lambda) -{ - const float Q = ff_aac_pow2sf_tab[200 + scale_idx - SCALE_ONE_POS + SCALE_DIV_512]; - const float IQ = ff_aac_pow2sf_tab[200 - scale_idx + SCALE_ONE_POS - SCALE_DIV_512]; - const float CLIPPED_ESCAPE = 165140.0f*Q; - int i, j, k; - const int dim = cb < FIRST_PAIR_BT ? 4 : 2; -//START_TIMER - if(!cb) - return; - - for(i = 0; i < size; i += dim){ - float mincost = INFINITY; - int minidx = 0; - int minbits = 0; - const float *vec = ff_aac_codebook_vectors[cb-1]; - 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]; - if(IS_CODEBOOK_UNSIGNED(cb)){ - for(k = 0; k < dim; k++){ - float t = fabsf(in[i+k]); - float di; - //do not code with escape sequence small values - if(vec[k] == 64.0f && t < 39.0f*Q){ - rd = INFINITY; - break; - } - if(vec[k] == 64.0f){//FIXME: slow - if (t >= CLIPPED_ESCAPE) { - di = t - CLIPPED_ESCAPE; - curbits += 21; - }else{ - int c = av_clip(quant(t, IQ), 0, 8191); - di = t - c*cbrt(c)*Q; - curbits += av_log2(c)*2 - 4 + 1; - } - }else{ - di = t - vec[k]*Q; - } - if(vec[k] != 0.0f) - curbits++; - rd += di*di*lambda; - } - }else{ - for(k = 0; k < dim; k++){ - float di = in[i+k] - vec[k]*Q; - rd += di*di*lambda; - } - } - rd += curbits; - if(rd < mincost){ - mincost = rd; - minidx = j; - minbits = curbits; - } - } - 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++) - if(ff_aac_codebook_vectors[cb-1][minidx*dim+j] != 0.0f) - put_bits(pb, 1, in[i+j] < 0.0f); - if(cb == ESC_BT){ - for(j = 0; j < 2; j++){ - if(ff_aac_codebook_vectors[cb-1][minidx*2+j] == 64.0f){ - int coef = av_clip(quant(fabsf(in[i+j]), IQ), 0, 8191); - int len = av_log2(coef); - - put_bits(pb, len - 4 + 1, (1 << (len - 4 + 1)) - 2); - put_bits(pb, len, coef & ((1 << len) - 1)); - } - } - } - } //STOP_TIMER("quantize_and_encode") } -#endif - /** * structure used in optimal codebook search */

1 0

[PATCH] AACENC: refactor quant for massive speedup
by Alex Converse 18 Jun '09

18 Jun '09

This patch set reduces encoding time by 56% for me. I hope it's not premature.

2 3

[soc]: r4467 - aacenc/aaccoder.c
by alexc 17 Jun '09

17 Jun '09

Author: alexc Date: Tue Jun 16 20:15:13 2009 New Revision: 4467 Log: Simplify log(x)/log(2) Modified: aacenc/aaccoder.c Modified: aacenc/aaccoder.c ============================================================================== --- aacenc/aaccoder.c Tue Jun 16 20:11:47 2009 (r4466) +++ aacenc/aaccoder.c Tue Jun 16 20:15:13 2009 (r4467) @@ -993,7 +993,7 @@ static void search_for_quantizers_faac(A if(curdiff == 0.0f) step = 0; else - step = fabsf(log(curdiff) / log(2)); + step = fabsf(log2(curdiff)); if(dist > uplim[w*16+g]) step = -step; if(FFABS(step) <= 1 || (step > 0 && scf >= max_scf) || (step < 0 && scf <= min_scf)){

3 3

[PATCH] AAC clipped escape distortion
by Alex Converse 17 Jun '09

17 Jun '09

We discussed this once without ever reaching a consensus. I'm going to bring it up again. if(vec[k] == 64.0f){//FIXME: slow This line is verifies an escape if(t >= 165140.0f*IQ){ // clipped value This line is a shortcut to determine if we have a clipped value di = t - 165140.0f; This line attempts to inverse quantize the coefficient and subtract it from the actual coefficient. Using the equation t - value^(4/3) where value =8191 curbits += 21; }else{ int c = av_clip(quant(t, Q), 0, 8191); This line quantizes the coefficient di = t - c*cbrt(c)*IQ; This line inverse quantizes the coefficient and subtracts it from the actual coefficient. Using the equation t - value^(4/3) * IQ curbits += av_log2(c)*2 - 4 + 1; } The two di lines do not use the same equation.

2 2