Rename more static symbols that are often inlined

Author: jmvalin

celt/arch.h

@@ -205,7 +205,7 @@ typedef oac_val32 celt_coef;
 # define MULT_COEF_TAPS(a, b) SHL32(MULT16_16(a, b), 1)
 # define COEF2VAL16(x) EXTRACT16(SHR32(x, 16))
 
-# define celt_isnan(x) 0
+# define oaci_celt_isnan(x) 0
 
 # define Q15ONE 32767
 # define Q31ONE 2147483647
@@ -276,7 +276,7 @@ typedef float celt_coef;
 # ifdef FLOAT_APPROX
 /* This code should reliably detect NaN/inf even when -ffast-math is used.
    Assumes IEEE 754 format. */
-static OAC_INLINE int celt_isnan(float x) {
+static OAC_INLINE int oaci_celt_isnan(float x) {
     union {float f; oac_uint32 i;} in;
     in.f = x;
     return ((in.i>>23)&0xFF) == 0xFF && (in.i&0x007FFFFF) != 0;
@@ -286,7 +286,7 @@ static OAC_INLINE int celt_isnan(float x) {
 #   error \
     Cannot build liboac with -ffast-math unless FLOAT_APPROX is defined. This could result in crashes on extreme (e.g. NaN) input
 #  endif
-#  define celt_isnan(x) ((x) != (x))
+#  define oaci_celt_isnan(x) ((x) != (x))
 # endif
 
 # define Q15ONE 1.0f
@@ -378,7 +378,7 @@ static OAC_INLINE int celt_isnan(float x) {
 
 # define SIG2RES(a)      ((1/CELT_SIG_SCALE)*(a))
 # define RES2INT16(a)    FLOAT2INT16(a)
-# define RES2INT24(a)    float2int(32768.f*256.f*(a))
+# define RES2INT24(a)    oaci_float2int(32768.f*256.f*(a))
 # define RES2FLOAT(a)    (a)
 # define INT16TORES(a)   ((a)*(1/CELT_SIG_SCALE))
 # define INT24TORES(a)   ((1.f/32768.f/256.f)*(a))

celt/bands.c

@@ -290,7 +290,7 @@ void oaci_anti_collapse(const CELTMode *m, celt_norm *X_, unsigned char *collaps
         N0 = m->eBands[i + 1] - m->eBands[i];
         /* depth in 1/8 bits */
         celt_sig_assert(pulses[i] >= 0);
-        depth = celt_udiv(1 + pulses[i], (m->eBands[i + 1] - m->eBands[i]))>>LM;
+        depth = oaci_celt_udiv(1 + pulses[i], (m->eBands[i + 1] - m->eBands[i]))>>LM;
 
 #ifdef FIXED_POINT
         thresh32 = SHR32(oaci_celt_exp2(-SHL16(depth, 10 - BITRES)), 1);
@@ -508,7 +508,7 @@ int oaci_spreading_decision(const CELTMode *m, const celt_norm *X, int *average,
 
             /* Only include four last bands (8 kHz and up) */
             if (i > m->nbEBands - 4)
-                hf_sum += celt_udiv(32*(tcount[1] + tcount[0]), N);
+                hf_sum += oaci_celt_udiv(32*(tcount[1] + tcount[0]), N);
             tmp = (2*tcount[2] >= N) + (2*tcount[1] >= N) + (2*tcount[0] >= N);
             sum += tmp*spread_weight[i];
             nbBands += spread_weight[i];
@@ -517,7 +517,7 @@ int oaci_spreading_decision(const CELTMode *m, const celt_norm *X, int *average,
 
     if (update_hf) {
         if (hf_sum)
-            hf_sum = celt_udiv(hf_sum, C*(4 - m->nbEBands + end));
+            hf_sum = oaci_celt_udiv(hf_sum, C*(4 - m->nbEBands + end));
         *hf_average = (*hf_average + hf_sum)>>1;
         hf_sum = *hf_average;
         if (*tapset_decision == 2)
@@ -534,7 +534,7 @@ int oaci_spreading_decision(const CELTMode *m, const celt_norm *X, int *average,
     /*printf("%d %d %d\n", hf_sum, *hf_average, *tapset_decision);*/
     celt_assert(nbBands > 0); /* end has to be non-zero */
     celt_assert(sum >= 0);
-    sum = celt_udiv((oac_int32)sum<<8, nbBands);
+    sum = oaci_celt_udiv((oac_int32)sum<<8, nbBands);
     /* Recursive averaging */
     sum = (sum + *average)>>1;
     *average = sum;
@@ -634,7 +634,7 @@ static int oaci_compute_qn(int N, int b, int offset, int pulse_cap, int stereo)
     /* The upper limit ensures that in a stereo split with itheta==16384, we'll
         always have enough bits left over to code at least one pulse in the
         side; otherwise it would collapse, since it doesn't get folded. */
-    qb = celt_sudiv(b + N2*offset, N2);
+    qb = oaci_celt_sudiv(b + N2*offset, N2);
     qb = IMIN(b - pulse_cap - (4<<BITRES), qb);
 
     qb = IMIN(8<<BITRES, qb);
@@ -727,7 +727,7 @@ static void oaci_compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
                     /* Check if the selected value of theta will cause the bit allocation
                        to inject noise on one side. If so, make sure the energy of that side
                        is zero. */
-                    int unquantized = celt_udiv((oac_int32)itheta*16384, qn);
+                    int unquantized = oaci_celt_udiv((oac_int32)itheta*16384, qn);
                     imid = oaci_bitexact_cos((oac_int16)unquantized);
                     iside = oaci_bitexact_cos((oac_int16)(16384 - unquantized));
                     delta = FRAC_MUL16((N - 1)<<7, oaci_bitexact_log2tan(iside, imid));
@@ -806,7 +806,7 @@ static void oaci_compute_theta(struct band_ctx *ctx, struct split_ctx *sctx,
             }
         }
         celt_assert(itheta >= 0);
-        itheta = celt_udiv((oac_int32)itheta*16384, qn);
+        itheta = oaci_celt_udiv((oac_int32)itheta*16384, qn);
         itheta_q30 = (oac_int32)itheta<<16;
         if (encode && stereo) {
             if (itheta == 0)
@@ -954,8 +954,8 @@ static unsigned oaci_quant_partition(struct band_ctx *ctx, celt_norm *X,
         mid = oaci_celt_cos_norm32(sctx.itheta_q30);
         side = oaci_celt_cos_norm32((1<<30) - sctx.itheta_q30);
 #else
-        mid = celt_cos_norm2(sctx.itheta_q30*(1.f/(1<<30)));
-        side = celt_cos_norm2(1.f - sctx.itheta_q30*(1.f/(1<<30)));
+        mid = oaci_celt_cos_norm2(sctx.itheta_q30*(1.f/(1<<30)));
+        side = oaci_celt_cos_norm2(1.f - sctx.itheta_q30*(1.f/(1<<30)));
 #endif
 
         /* Give more bits to low-energy MDCTs than they would otherwise deserve */
@@ -1103,8 +1103,8 @@ unsigned oaci_cubic_quant_partition(struct band_ctx *ctx, celt_norm *X, int N, i
         g1 = oaci_celt_cos_norm32(itheta_q30);
         g2 = oaci_celt_cos_norm32((1<<30) - itheta_q30);
 #else
-        g1 = celt_cos_norm2(itheta_q30*(1.f/(1<<30)));
-        g2 = celt_cos_norm2(1.f - itheta_q30*(1.f/(1<<30)));
+        g1 = oaci_celt_cos_norm2(itheta_q30*(1.f/(1<<30)));
+        g2 = oaci_celt_cos_norm2(1.f - itheta_q30*(1.f/(1<<30)));
 #endif
         if (itheta_q30 == 0) {
             b1 = b;
@@ -1144,7 +1144,7 @@ static unsigned oaci_quant_band(struct band_ctx *ctx, celt_norm *X,
 
     longBlocks = B0 == 1;
 
-    N_B = celt_udiv(N_B, B);
+    N_B = oaci_celt_udiv(N_B, B);
 
     /* Special case for one sample */
     if (N == 1) {
@@ -1287,8 +1287,8 @@ static unsigned oaci_quant_band_stereo(struct band_ctx *ctx, celt_norm *X, celt_
     mid = oaci_celt_cos_norm32(sctx.itheta_q30);
     side = oaci_celt_cos_norm32((1<<30) - sctx.itheta_q30);
 #else
-    mid = celt_cos_norm2(sctx.itheta_q30*(1.f/(1<<30)));
-    side = celt_cos_norm2(1.f - sctx.itheta_q30*(1.f/(1<<30)));
+    mid = oaci_celt_cos_norm2(sctx.itheta_q30*(1.f/(1<<30)));
+    side = oaci_celt_cos_norm2(1.f - sctx.itheta_q30*(1.f/(1<<30)));
 #endif
 
     /* This is a special case for N=2 that only works for stereo and takes
@@ -1510,7 +1510,7 @@ void oaci_quant_all_bands(int encode, const CELTMode *m, int start, int end,
         remaining_bits = total_bits - tell;
         ctx.total_bits = total_bits;
         if (i <= codedBands - 1) {
-            curr_balance = celt_sudiv(balance, IMIN(3, codedBands - i));
+            curr_balance = oaci_celt_sudiv(balance, IMIN(3, codedBands - i));
             b = IMAX(0, IMIN(16383, IMIN(remaining_bits, pulses[i] + curr_balance)));
         } else {
             b = 0;

celt/celt.h

@@ -168,11 +168,11 @@ typedef struct {
 #define CELT_SET_SILK_INFO(x) CELT_SET_SILK_INFO_REQUEST, celt_check_silkinfo_ptr(x)
 
 
-static OAC_INLINE oac_int32 bits_to_bitrate(oac_int32 bits, oac_int32 Fs, oac_int32 frame_size) {
+static OAC_INLINE oac_int32 oaci_bits_to_bitrate(oac_int32 bits, oac_int32 Fs, oac_int32 frame_size) {
     return bits*(6*Fs/frame_size)/6;
 }
 
-static OAC_INLINE oac_int32 bitrate_to_bits(oac_int32 bitrate, oac_int32 Fs, oac_int32 frame_size) {
+static OAC_INLINE oac_int32 oaci_bitrate_to_bits(oac_int32 bitrate, oac_int32 Fs, oac_int32 frame_size) {
     return bitrate*6/(6*Fs/frame_size);
 }
 
@@ -237,7 +237,7 @@ static const unsigned char fromOacTable[16] = {
     0x00, 0x08, 0x10, 0x18
 };
 
-static OAC_INLINE int toOac(unsigned char c) {
+static OAC_INLINE int oaci_toOac(unsigned char c) {
     int ret = 0;
     if (c < 0xA0)
         ret = toOacTable[c>>3];
@@ -247,7 +247,7 @@ static OAC_INLINE int toOac(unsigned char c) {
         return ret|(c&0x7);
 }
 
-static OAC_INLINE int fromOac(unsigned char c) {
+static OAC_INLINE int oaci_fromOac(unsigned char c) {
     if (c < 0x80)
         return -1;
     else

celt/celt_decoder.c

@@ -627,7 +627,7 @@ void oaci_update_plc_state(LPCNetPLCState *lpcnet, celt_sig *decode_mem[2], floa
         for (j = 0; j < SINC_ORDER + 1; j++) {
             sum += buf48k[3*i + j + offset]*sinc_filter[j];
         }
-        buf16k[i] = float2int(MIN32(32767.f, MAX32(-32767.f, sum)));
+        buf16k[i] = oaci_float2int(MIN32(32767.f, MAX32(-32767.f, sum)));
     }
     tmp_read_post = lpcnet->fec_read_pos;
     tmp_fec_skip = lpcnet->fec_skip;
@@ -1126,7 +1126,7 @@ int oaci_celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned
         if (mode->Fs == 48000 && mode->shortMdctSize == 120)
 # endif
         {
-            data0 = fromOac(data0);
+            data0 = oaci_fromOac(data0);
             if (data0 < 0)
                 return OAC_INVALID_PACKET;
         }
@@ -1457,7 +1457,7 @@ int oaci_celt_decode_with_ec_dred(CELTDecoder * OAC_RESTRICT st, const unsigned
     RESTORE_STACK;
     if (oaci_ec_tell(dec) > 8*len)
         return OAC_INTERNAL_ERROR;
-    if (ec_get_error(dec))
+    if (oaci_ec_get_error(dec))
         st->error = 1;
     return frame_size/st->downsample;
 }

celt/celt_encoder.c

@@ -434,8 +434,8 @@ static int oaci_transient_analysis(const oac_val32 * OAC_RESTRICT in, int len, i
            before it does any damage later on. If these asserts are disabled (no hardening), then the table
            lookup a few lines below (id = ...) is likely to crash dur to an out-of-bounds read. DO NOT FIX
            that crash on NaN since it could result in a worse issue later on. */
-        celt_assert(!celt_isnan(tmp[0]));
-        celt_assert(!celt_isnan(norm));
+        celt_assert(!oaci_celt_isnan(tmp[0]));
+        celt_assert(!oaci_celt_isnan(norm));
         for (i = 12; i < len2 - 5; i += 4) {
             int id;
 #ifdef FIXED_POINT
@@ -1790,7 +1790,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
         if (mode->Fs == 48000 && mode->shortMdctSize == 120)
 # endif
         {
-            int c0 = toOac(compressed[0]);
+            int c0 = oaci_toOac(compressed[0]);
             if (c0 < 0) {
                 RESTORE_STACK;
                 return OAC_BAD_ARG;
@@ -1808,7 +1808,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
     nbCompressedBytes = IMIN(nbCompressedBytes, packet_size_cap);
 
     if (st->vbr && st->bitrate != OAC_BITRATE_MAX) {
-        vbr_rate = bitrate_to_bits(st->bitrate, mode->Fs, frame_size)<<BITRES;
+        vbr_rate = oaci_bitrate_to_bits(st->bitrate, mode->Fs, frame_size)<<BITRES;
 #if defined(CUSTOM_MODES) || defined(ENABLE_OAC_CUSTOM_API)
         if (st->signalling)
             vbr_rate -= 8<<BITRES;
@@ -1981,7 +1981,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
     oaci_compute_mdcts(mode, shortBlocks, in, freq, C, CC, LM, st->upsample, st->arch);
     /* This should catch any NaN in the CELT input. Since we're not supposed to see any (they're filtered
        at the Oac layer), just abort. */
-    celt_assert(!celt_isnan(freq[0]) && (C == 1 || !celt_isnan(freq[N])));
+    celt_assert(!oaci_celt_isnan(freq[0]) && (C == 1 || !oaci_celt_isnan(freq[N])));
     if (CC == 2 && C == 1)
         tf_chan = 0;
     oaci_compute_band_energies(mode, freq, bandE, effEnd, C, LM, st->arch);
@@ -2551,7 +2551,7 @@ int oaci_celt_encode_with_ec(CELTEncoder * OAC_RESTRICT st, const oac_res * pcm,
 #endif
 
     RESTORE_STACK;
-    if (ec_get_error(enc))
+    if (oaci_ec_get_error(enc))
         return OAC_INTERNAL_ERROR;
     else
         return nbCompressedBytes;

celt/cwrs.c

@@ -472,7 +472,7 @@ void oaci_get_required_bits(oac_int16 *_bits, int _n, int _maxk, int _frac) {
 }
 # endif
 
-static oac_uint32 icwrs(int _n, const int *_y) {
+static oac_uint32 oaci_icwrs(int _n, const int *_y) {
     oac_uint32 i;
     int j;
     int k;
@@ -491,10 +491,10 @@ static oac_uint32 icwrs(int _n, const int *_y) {
 
 void oaci_encode_pulses(const int *_y, int _n, int _k, ec_enc *_enc) {
     celt_assert(_k > 0);
-    oaci_ec_enc_uint(_enc, icwrs(_n, _y), CELT_PVQ_V(_n, _k));
+    oaci_ec_enc_uint(_enc, oaci_icwrs(_n, _y), CELT_PVQ_V(_n, _k));
 }
 
-static oac_val32 cwrsi(int _n, int _k, oac_uint32 _i, int *_y) {
+static oac_val32 oaci_cwrsi(int _n, int _k, oac_uint32 _i, int *_y) {
     oac_uint32 p;
     int s;
     int k0;
@@ -569,7 +569,7 @@ static oac_val32 cwrsi(int _n, int _k, oac_uint32 _i, int *_y) {
 }
 
 oac_val32 oaci_decode_pulses(int *_y, int _n, int _k, ec_dec *_dec) {
-    return cwrsi(_n, _k, oaci_ec_dec_uint(_dec, CELT_PVQ_V(_n, _k)), _y);
+    return oaci_cwrsi(_n, _k, oaci_ec_dec_uint(_dec, CELT_PVQ_V(_n, _k)), _y);
 }
 
 #else /* SMALL_FOOTPRINT */
@@ -634,7 +634,7 @@ static oac_uint32 oaci_ncwrs_urow(unsigned _n, unsigned _k, oac_uint32 *_u) {
    _y: Returns the vector of pulses.
    _u: Must contain entries [0..._k+1] of row _n of U() on input.
       Its contents will be destructively modified.*/
-static oac_val32 cwrsi(int _n, int _k, oac_uint32 _i, int *_y, oac_uint32 *_u) {
+static oac_val32 oaci_cwrsi(int _n, int _k, oac_uint32 _i, int *_y, oac_uint32 *_u) {
     int j;
     oac_int16 val;
     oac_val32 yy = 0;
@@ -673,7 +673,7 @@ static OAC_INLINE oac_uint32 icwrs1(const int *_y, int *_k) {
    of size _n with associated sign bits.
    _y:  The vector of pulses, whose sum of absolute values must be _k.
    _nc: Returns V(_n,_k).*/
-static OAC_INLINE oac_uint32 icwrs(int _n, int _k, oac_uint32 *_nc, const int *_y,
+static OAC_INLINE oac_uint32 oaci_icwrs(int _n, int _k, oac_uint32 *_nc, const int *_y,
                                    oac_uint32 *_u) {
     oac_uint32 i;
     int j;
@@ -725,7 +725,7 @@ void oaci_encode_pulses(const int *_y, int _n, int _k, ec_enc *_enc) {
     SAVE_STACK;
     celt_assert(_k > 0);
     ALLOC(u, _k + 2U, oac_uint32);
-    i = icwrs(_n, _k, &nc, _y, u);
+    i = oaci_icwrs(_n, _k, &nc, _y, u);
     oaci_ec_enc_uint(_enc, i, nc);
     RESTORE_STACK;
 }
@@ -736,7 +736,7 @@ oac_val32 oaci_decode_pulses(int *_y, int _n, int _k, ec_dec *_dec) {
     SAVE_STACK;
     celt_assert(_k > 0);
     ALLOC(u, _k + 2U, oac_uint32);
-    ret = cwrsi(_n, _k, oaci_ec_dec_uint(_dec, oaci_ncwrs_urow(_n, _k, u)), _y, u);
+    ret = oaci_cwrsi(_n, _k, oaci_ec_dec_uint(_dec, oaci_ncwrs_urow(_n, _k, u)), _y, u);
     RESTORE_STACK;
     return ret;
 }

celt/entcode.h

@@ -123,15 +123,15 @@ struct ec_ctx {
     int error;
 };
 
-static OAC_INLINE oac_uint32 ec_range_bytes(ec_ctx *_this) {
+static OAC_INLINE oac_uint32 oaci_ec_range_bytes(ec_ctx *_this) {
     return _this->offs;
 }
 
-static OAC_INLINE unsigned char *ec_get_buffer(ec_ctx *_this) {
+static OAC_INLINE unsigned char *oaci_ec_get_buffer(ec_ctx *_this) {
     return _this->buf;
 }
 
-static OAC_INLINE int ec_get_error(ec_ctx *_this) {
+static OAC_INLINE int oaci_ec_get_error(ec_ctx *_this) {
     return _this->error;
 }
 
@@ -154,7 +154,7 @@ static OAC_INLINE int oaci_ec_tell(ec_ctx *_this) {
 oac_uint32 oaci_ec_tell_frac(ec_ctx *_this);
 
 /* Tested exhaustively for all n and for 1<=d<=256 */
-static OAC_INLINE oac_uint32 celt_udiv(oac_uint32 n, oac_uint32 d) {
+static OAC_INLINE oac_uint32 oaci_celt_udiv(oac_uint32 n, oac_uint32 d) {
     celt_sig_assert(d > 0);
 # ifdef USE_SMALL_DIV_TABLE
     if (d > 256)
@@ -170,13 +170,13 @@ static OAC_INLINE oac_uint32 celt_udiv(oac_uint32 n, oac_uint32 d) {
 # endif
 }
 
-static OAC_INLINE oac_int32 celt_sudiv(oac_int32 n, oac_int32 d) {
+static OAC_INLINE oac_int32 oaci_celt_sudiv(oac_int32 n, oac_int32 d) {
     celt_sig_assert(d > 0);
 # ifdef USE_SMALL_DIV_TABLE
     if (n < 0)
-        return -(oac_int32)celt_udiv(-n, d);
+        return -(oac_int32)oaci_celt_udiv(-n, d);
     else
-        return celt_udiv(n, d);
+        return oaci_celt_udiv(n, d);
 # else
     return n/d;
 # endif

celt/entdec.c

@@ -171,7 +171,7 @@ void oaci_ec_dec_init(ec_dec *_this, unsigned char *_buf, oac_uint32 _storage) {
 
 unsigned oaci_ec_decode(ec_dec *_this, unsigned _ft) {
     unsigned s;
-    _this->ext = celt_udiv(_this->rng, _ft);
+    _this->ext = oaci_celt_udiv(_this->rng, _ft);
     s = (unsigned)(_this->val/_this->ext);
     return _ft - EC_MINI(s + 1, _ft);
 }

celt/entenc.c

@@ -159,7 +159,7 @@ void oaci_ec_enc_init(ec_enc *_this, unsigned char *_buf, oac_uint32 _size) {
 
 void oaci_ec_encode(ec_enc *_this, unsigned _fl, unsigned _fh, unsigned _ft) {
     oac_uint32 r;
-    r = celt_udiv(_this->rng, _ft);
+    r = oaci_celt_udiv(_this->rng, _ft);
     if (_fl > 0) {
         _this->val += _this->rng - IMUL32(r, (_ft - _fl));
         _this->rng = IMUL32(r, (_fh - _fl));