As well as tables littered everywhere, functions were spread out all across the encoder's files. This moves them to a single place where they can be used by either the encoder's main files or additional encoder files. Additionally, it changes the type of some to 'inline' to enable us to simply put them in a header file and possibly gain some speed due to compiler optimizations.
Showing the changes to libavcodec/aaccoder.c (1 of 3 files). Show all
Unified · Split
| @@ -40,6 +40,7 @@ · 39 unmodified lines | |||
| 40 | #include "aacenc.h" | 40 | #include "aacenc.h" |
| 41 | #include "aactab.h" | 41 | #include "aactab.h" |
| 42 | #include "aacenctab.h" | 42 | #include "aacenctab.h" |
| 43 | #include "aacenc_utils.h" | ||
| 43 | #include "aac_tablegen_decl.h" | 44 | #include "aac_tablegen_decl.h" |
| 44 | 45 | ||
| 45 | /** Frequency in Hz for lower limit of noise substitution **/ | 46 | /** Frequency in Hz for lower limit of noise substitution **/ |
| @@ -57,45 +58,6 @@ · 11 unmodified lines | |||
| 57 | /** Frequency in Hz for lower limit of intensity stereo **/ | 58 | /** Frequency in Hz for lower limit of intensity stereo **/ |
| 58 | #define INT_STEREO_LOW_LIMIT 6100 | 59 | #define INT_STEREO_LOW_LIMIT 6100 |
| 59 | 60 | ||
| 60 | #define ROUND_STANDARD 0.4054f | ||
| 61 | #define ROUND_TO_ZERO 0.1054f | ||
| 62 | |||
| 63 | /** | ||
| 64 | * Quantize one coefficient. | ||
| 65 | * @return absolute value of the quantized coefficient | ||
| 66 | * @see 3GPP TS26.403 5.6.2 "Scalefactor determination" | ||
| 67 | */ | ||
| 68 | static av_always_inline int quant(float coef, const float Q, const float rounding) | ||
| 69 | { | ||
| 70 | float a = coef * Q; | ||
| 71 | return sqrtf(a * sqrtf(a)) + rounding; | ||
| 72 | } | ||
| 73 | |||
| 74 | static void quantize_bands(int *out, const float *in, const float *scaled, | ||
| 75 | int size, float Q34, int is_signed, int maxval, const float rounding) | ||
| 76 | { | ||
| 77 | int i; | ||
| 78 | double qc; | ||
| 79 | for (i = 0; i < size; i++) { | ||
| 80 | qc = scaled[i] * Q34; | ||
| 81 | out[i] = (int)FFMIN(qc + rounding, (double)maxval); | ||
| 82 | if (is_signed && in[i] < 0.0f) { | ||
| 83 | out[i] = -out[i]; | ||
| 84 | } | ||
| 85 | } | ||
| 86 | } | ||
| 87 | |||
| 88 | static void abs_pow34_v(float *out, const float *in, const int size) | ||
| 89 | { | ||
| 90 | #ifndef USE_REALLY_FULL_SEARCH | ||
| 91 | int i; | ||
| 92 | for (i = 0; i < size; i++) { | ||
| 93 | float a = fabsf(in[i]); | ||
| 94 | out[i] = sqrtf(a * sqrtf(a)); | ||
| 95 | } | ||
| 96 | #endif /* USE_REALLY_FULL_SEARCH */ | ||
| 97 | } | ||
| 98 | |||
| 99 | /** | 61 | /** |
| 100 | * Calculate rate distortion cost for quantizing with given codebook | 62 | * Calculate rate distortion cost for quantizing with given codebook |
| 101 | * | 63 | * |
| @@ -310,32 +272,6 @@ static void quantize_and_encode_band(struct AACEncContext *s, PutBitContext *pb, · 208 unmodified lines | |||
| 310 | INFINITY, NULL, rtz); | 272 | INFINITY, NULL, rtz); |
| 311 | } | 273 | } |
| 312 | 274 | ||
| 313 | static float find_max_val(int group_len, int swb_size, const float *scaled) { | ||
| 314 | float maxval = 0.0f; | ||
| 315 | int w2, i; | ||
| 316 | for (w2 = 0; w2 < group_len; w2++) { | ||
| 317 | for (i = 0; i < swb_size; i++) { | ||
| 318 | maxval = FFMAX(maxval, scaled[w2*128+i]); | ||
| 319 | } | ||
| 320 | } | ||
| 321 | return maxval; | ||
| 322 | } | ||
| 323 | |||
| 324 | static int find_min_book(float maxval, int sf) { | ||
| 325 | float Q = ff_aac_pow2sf_tab[POW_SF2_ZERO - sf + SCALE_ONE_POS - SCALE_DIV_512]; | ||
| 326 | float Q34 = sqrtf(Q * sqrtf(Q)); | ||
| 327 | int qmaxval, cb; | ||
| 328 | qmaxval = maxval * Q34 + 0.4054f; | ||
| 329 | if (qmaxval == 0) cb = 0; | ||
| 330 | else if (qmaxval == 1) cb = 1; | ||
| 331 | else if (qmaxval == 2) cb = 3; | ||
| 332 | else if (qmaxval <= 4) cb = 5; | ||
| 333 | else if (qmaxval <= 7) cb = 7; | ||
| 334 | else if (qmaxval <= 12) cb = 9; | ||
| 335 | else cb = 11; | ||
| 336 | return cb; | ||
| 337 | } | ||
| 338 | |||
| 339 | /** | 275 | /** |
| 340 | * structure used in optimal codebook search | 276 | * structure used in optimal codebook search |
| 341 | */ | 277 | */ |
| @@ -590,16 +526,6 @@ static void codebook_trellis_rate(AACEncContext *s, SingleChannelElement *sce, · 248 unmodified lines | |||
| 590 | } | 526 | } |
| 591 | } | 527 | } |
| 592 | 528 | ||
| 593 | /** Return the minimum scalefactor where the quantized coef does not clip. */ | ||
| 594 | static av_always_inline uint8_t coef2minsf(float coef) { | ||
| 595 | return av_clip_uint8(log2f(coef)*4 - 69 + SCALE_ONE_POS - SCALE_DIV_512); | ||
| 596 | } | ||
| 597 | |||
| 598 | /** Return the maximum scalefactor where the quantized coef is not zero. */ | ||
| 599 | static av_always_inline uint8_t coef2maxsf(float coef) { | ||
| 600 | return av_clip_uint8(log2f(coef)*4 + 6 + SCALE_ONE_POS - SCALE_DIV_512); | ||
| 601 | } | ||
| 602 | |||
| 603 | typedef struct TrellisPath { | 529 | typedef struct TrellisPath { |
| 604 | float cost; | 530 | float cost; |
| 605 | int prev; | 531 | int prev; |