Showing the changes to libavcodec/aaccoder.c (1 of 4 files). Show all
Unified · Split
| @@ -108,8 +108,8 @@ static av_always_inline float quantize_and_encode_band_cost_template( · 107 unmodified lines | ||
| 108 | 108 | int *bits, int BT_ZERO, int BT_UNSIGNED, |
| 109 | 109 | int BT_PAIR, int BT_ESC) |
| 110 | 110 | { |
| 111 | − const float IQ = ff_aac_pow2sf_tab[200 + scale_idx - SCALE_ONE_POS + SCALE_DIV_512]; | |
| 112 | − const float Q = ff_aac_pow2sf_tab[200 - scale_idx + SCALE_ONE_POS - SCALE_DIV_512]; | |
| 111 | + const float IQ = ff_aac_pow2sf_tab[POW_SF2_ZERO + scale_idx - SCALE_ONE_POS + SCALE_DIV_512]; | |
| 112 | + const float Q = ff_aac_pow2sf_tab[POW_SF2_ZERO - scale_idx + SCALE_ONE_POS - SCALE_DIV_512]; | |
| 113 | 113 | const float CLIPPED_ESCAPE = 165140.0f*IQ; |
| 114 | 114 | int i, j; |
| 115 | 115 | float cost = 0; |
| @@ -280,7 +280,7 @@ static float find_max_val(int group_len, int swb_size, const float *scaled) { · 164 unmodified lines | ||
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | static int find_min_book(float maxval, int sf) { |
| 283 | − float Q = ff_aac_pow2sf_tab[200 - sf + SCALE_ONE_POS - SCALE_DIV_512]; | |
| 283 | + float Q = ff_aac_pow2sf_tab[POW_SF2_ZERO - sf + SCALE_ONE_POS - SCALE_DIV_512]; | |
| 284 | 284 | float Q34 = sqrtf(Q * sqrtf(Q)); |
| 285 | 285 | int qmaxval, cb; |
| 286 | 286 | qmaxval = maxval * Q34 + 0.4054f; |
| @@ -955,7 +955,7 @@ static void search_for_quantizers_faac(AVCodecContext *avctx, AACEncContext *s, · 668 unmodified lines | ||
| 955 | 955 | dist -= b; |
| 956 | 956 | } |
| 957 | 957 | dist *= 1.0f / 512.0f / lambda; |
| 958 | − quant_max = quant(maxq[w*16+g], ff_aac_pow2sf_tab[200 - scf + SCALE_ONE_POS - SCALE_DIV_512]); | |
| 958 | + quant_max = quant(maxq[w*16+g], ff_aac_pow2sf_tab[POW_SF2_ZERO - scf + SCALE_ONE_POS - SCALE_DIV_512]); | |
| 959 | 959 | if (quant_max >= 8191) { // too much, return to the previous quantizer |
| 960 | 960 | sce->sf_idx[w*16+g] = prev_scf; |
| 961 | 961 | break; |