diff --git a/libcelt/_kiss_fft_guts.h b/libcelt/_kiss_fft_guts.h
index 4c39073db85b5a307edb6a7e9a7081e05ab5a6b7..38a2fba0aaaa31c33f8863539823a11b14173eee 100644
--- a/libcelt/_kiss_fft_guts.h
+++ b/libcelt/_kiss_fft_guts.h
@@ -23,7 +23,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
typedef struct { kiss_fft_scalar r; kiss_fft_scalar i; }kiss_fft_cpx; */
#include "kiss_fft.h"
-
/*
Explanation of macros dealing with complex math:
@@ -40,20 +39,16 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
#ifdef DOUBLE_PRECISION
-# define FRACBITS 31
# define SAMPPROD long long
#define SAMP_MAX 2147483647
#define TWID_MAX 32767
#define TRIG_UPSCALE 1
-#define EXT32(a) (a)
#else /* DOUBLE_PRECISION */
-# define FRACBITS 15
# define SAMPPROD opus_int32
#define SAMP_MAX 32767
#define TRIG_UPSCALE 1
-#define EXT32(a) EXTEND32(a)
#endif /* !DOUBLE_PRECISION */
@@ -65,10 +60,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
fprintf(stderr,"WARNING:overflow @ " __FILE__ "(%d): (%d " #op" %d) = %ld\n",__LINE__,(a),(b),(SAMPPROD)(a) op (SAMPPROD)(b) ); }
#endif
-# define smul(a,b) ( (SAMPPROD)(a)*(b) )
-# define sround( x ) (kiss_fft_scalar)( ( (x) + ((SAMPPROD)1<<(FRACBITS-1)) ) >> FRACBITS )
-
-
# define S_MUL(a,b) MULT16_32_Q15(b, a)
# define C_MUL(m,a,b) \
@@ -108,13 +99,8 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
do {(res).r = ADD32((res).r,(a).r); (res).i = SUB32((res).i,(a).i); \
}while(0)
-
-
-
#else /* not FIXED_POINT*/
-#define EXT32(a) (a)
-
# define S_MUL(a,b) ( (a)*(b) )
#define C_MUL(m,a,b) \
do{ (m).r = (a).r*(b).r - (a).i*(b).i;\
@@ -131,8 +117,6 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
(c).i *= (s); }while(0)
#endif
-
-
#ifndef CHECK_OVERFLOW_OP
# define CHECK_OVERFLOW_OP(a,op,b) /* noop */
#endif
@@ -193,5 +177,4 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
(x)->i = TRIG_UPSCALE*celt_cos_norm((phase)-32768);\
}while(0)
-
#endif /* KISS_FFT_GUTS_H */
diff --git a/libcelt/arch.h b/libcelt/arch.h
index 1ce1cda686b312b1f9f3c8bf0b691bcce8613c7b..b025b3d1fbde9f46c9061ced6aedd37cc77879a6 100644
--- a/libcelt/arch.h
+++ b/libcelt/arch.h
@@ -71,8 +71,6 @@ static inline void _celt_fatal(const char *str, const char *file, int line)
#endif
#define IMUL32(a,b) ((a)*(b))
-#define UMUL32(a,b) ((opus_int32)(a)*(opus_int32)(b))
-#define UMUL16_16(a,b) ((opus_int32)(a)*(opus_int32)(b))
#define ABS(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute integer value. */
#define ABS16(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute 16-bit value. */
@@ -99,30 +97,16 @@ typedef opus_val32 celt_ener;
typedef opus_val32 celt_mask;
#define Q15ONE 32767
-#define Q30ONE 1073741823
#define SIG_SHIFT 12
#define NORM_SCALING 16384
-#define NORM_SCALING_1 (1.f/16384.f)
-#define NORM_SHIFT 14
-
-#define ENER_SCALING 16384.f
-#define ENER_SCALING_1 (1.f/16384.f)
-#define ENER_SHIFT 14
-
-#define PGAIN_SCALING 32768.f
-#define PGAIN_SCALING_1 (1.f/32768.f)
-#define PGAIN_SHIFT 15
#define DB_SHIFT 10
#define EPSILON 1
-#define VERY_SMALL 0
-#define VERY_LARGE32 ((opus_val32)2147483647)
#define VERY_LARGE16 ((opus_val16)32767)
#define Q15_ONE ((opus_val16)32767)
-#define Q15_ONE_1 (1.f/32768.f)
#define SCALEIN(a) (a)
#define SCALEOUT(a) (a)
@@ -147,7 +131,6 @@ typedef opus_val32 celt_mask;
#endif
-
#else /* FIXED_POINT */
typedef float opus_val16;
@@ -160,21 +143,12 @@ typedef float celt_pgain;
typedef float celt_mask;
#define Q15ONE 1.0f
-#define Q30ONE 1.0f
#define NORM_SCALING 1.f
-#define NORM_SCALING_1 1.f
-#define ENER_SCALING 1.f
-#define ENER_SCALING_1 1.f
-#define PGAIN_SCALING 1.f
-#define PGAIN_SCALING_1 1.f
#define EPSILON 1e-15f
-#define VERY_SMALL 1e-15f
-#define VERY_LARGE32 1e15f
#define VERY_LARGE16 1e15f
#define Q15_ONE ((opus_val16)1.f)
-#define Q15_ONE_1 ((opus_val16)1.f)
#define QCONST16(x,bits) (x)
#define QCONST32(x,bits) (x)
@@ -187,11 +161,8 @@ typedef float celt_mask;
#define SHL16(a,shift) (a)
#define SHR32(a,shift) (a)
#define SHL32(a,shift) (a)
-#define PSHR16(a,shift) (a)
#define PSHR32(a,shift) (a)
#define VSHR32(a,shift) (a)
-#define SATURATE16(x,a) (x)
-#define SATURATE32(x,a) (x)
#define PSHR(a,shift) (a)
#define SHR(a,shift) (a)
@@ -210,21 +181,13 @@ typedef float celt_mask;
#define MULT16_16(a,b) ((opus_val32)(a)*(opus_val32)(b))
#define MAC16_16(c,a,b) ((c)+(opus_val32)(a)*(opus_val32)(b))
-#define MULT16_32_Q11(a,b) ((a)*(b))
-#define MULT16_32_Q13(a,b) ((a)*(b))
-#define MULT16_32_Q14(a,b) ((a)*(b))
#define MULT16_32_Q15(a,b) ((a)*(b))
#define MULT16_32_Q16(a,b) ((a)*(b))
-#define MULT16_32_P15(a,b) ((a)*(b))
#define MULT32_32_Q31(a,b) ((a)*(b))
-#define MAC16_32_Q11(c,a,b) ((c)+(a)*(b))
#define MAC16_32_Q15(c,a,b) ((c)+(a)*(b))
-#define MAC16_16_Q11(c,a,b) ((c)+(a)*(b))
-#define MAC16_16_Q13(c,a,b) ((c)+(a)*(b))
-#define MAC16_16_P13(c,a,b) ((c)+(a)*(b))
#define MULT16_16_Q11_32(a,b) ((a)*(b))
#define MULT16_16_Q13(a,b) ((a)*(b))
#define MULT16_16_Q14(a,b) ((a)*(b))
@@ -234,31 +197,13 @@ typedef float celt_mask;
#define MULT16_16_P14(a,b) ((a)*(b))
#define DIV32_16(a,b) (((opus_val32)(a))/(opus_val16)(b))
-#define PDIV32_16(a,b) (((opus_val32)(a))/(opus_val16)(b))
#define DIV32(a,b) (((opus_val32)(a))/(opus_val32)(b))
-#define PDIV32(a,b) (((opus_val32)(a))/(opus_val32)(b))
#define SCALEIN(a) ((a)*CELT_SIG_SCALE)
#define SCALEOUT(a) ((a)*(1/CELT_SIG_SCALE))
#endif /* !FIXED_POINT */
-
-#if defined (CONFIG_TI_C54X) || defined (CONFIG_TI_C55X)
-
-/* 2 on TI C5x DSP */
-#define BYTES_PER_CHAR 2
-#define BITS_PER_CHAR 16
-#define LOG2_BITS_PER_CHAR 4
-
-#else /* CONFIG_TI_C54X */
-
-#define BYTES_PER_CHAR 1
-#define BITS_PER_CHAR 8
-#define LOG2_BITS_PER_CHAR 3
-
-#endif /* !CONFIG_TI_C54X */
-
#ifndef GLOBAL_STACK_SIZE
#ifdef FIXED_POINT
#define GLOBAL_STACK_SIZE 100000
diff --git a/libcelt/bands.c b/libcelt/bands.c
index f86dea3ea93a4285f55ad7d28518ef1bad3433f9..7952de0c320210d7aac660a68b1a2adccca89fa2 100644
--- a/libcelt/bands.c
+++ b/libcelt/bands.c
@@ -296,10 +296,8 @@ void anti_collapse(const CELTMode *m, celt_norm *_X, unsigned char *collapse_mas
renormalise_vector(X, N0<<LM, Q15ONE);
} while (++c<C);
}
-
}
-
static void intensity_stereo(const CELTMode *m, celt_norm *X, celt_norm *Y, const celt_ener *bank, int bandID, int N)
{
int i = bandID;
diff --git a/libcelt/bands.h b/libcelt/bands.h
index 80f62c8640b61a634c66ce7491ceb648dfb09a44..4b1bdf88c8b07433141e77e600888f8746e2ef85 100644
--- a/libcelt/bands.h
+++ b/libcelt/bands.h
@@ -86,7 +86,6 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end,
int time_domain, int fold, int dual_stereo, int intensity, int *tf_res, int resynth,
opus_int32 total_bits, opus_int32 balance, ec_ctx *ec, int M, int codedBands, opus_uint32 *seed);
-
void stereo_decision(const CELTMode *m, celt_norm * restrict X, int *stereo_mode, int len, int M);
void anti_collapse(const CELTMode *m, celt_norm *_X, unsigned char *collapse_masks, int LM, int C, int CC, int size,
diff --git a/libcelt/celt.c b/libcelt/celt.c
index 5e962e36ded4ee2e9490c339b83f17a523224513..3341070f71c49bc8211a6ad2e1e1f4df884c7880 100644
--- a/libcelt/celt.c
+++ b/libcelt/celt.c
@@ -1180,7 +1180,7 @@ int celt_encode_with_ec_float(CELTEncoder * restrict st, const celt_sig * pcm, i
#ifdef FIXED_POINT
qg = ((gain1+1536)>>10)/3-1;
#else
- qg = floor(.5+gain1*32/3)-1;
+ qg = (int)floor(.5f+gain1*32/3)-1;
#endif
qg = IMAX(0, IMIN(7, qg));
ec_enc_bit_logp(enc, 1, 1);
diff --git a/libcelt/celt.h b/libcelt/celt.h
index 29e28539c1fd505ee2e56e521c602bbfa50b47c7..7a3064dd65256291f7b143f19e4375ecd074fe1f 100644
--- a/libcelt/celt.h
+++ b/libcelt/celt.h
@@ -71,7 +71,6 @@ extern "C" {
/** Memory allocation has failed */
#define CELT_ALLOC_FAIL -7
-
/* Encoder/decoder Requests */
#define CELT_SET_COMPLEXITY_REQUEST 2
@@ -122,8 +121,6 @@ extern "C" {
#define CELT_SET_END_BAND_REQUEST 10001
#define CELT_SET_END_BAND(x) CELT_SET_END_BAND_REQUEST, _celt_check_int(x)
-
-
/** Contains the state of an encoder. One encoder state is needed
for each stream. It is initialised once at the beginning of the
stream. Do *not* re-initialise the state for every frame.
@@ -142,7 +139,6 @@ typedef struct CELTDecoder CELTDecoder;
bad */
typedef struct CELTMode CELTMode;
-
/** \defgroup codec Encoding and decoding */
/* @{ */
@@ -308,7 +304,6 @@ CELT_EXPORT int celt_decode(CELTDecoder *st, const unsigned char *data, int len,
*/
CELT_EXPORT int celt_decoder_ctl(CELTDecoder * st, int request, ...);
-
/** Returns the English string that corresponds to an error code
* @param error Error code (negative for an error, 0 for success
* @return Constant string (must NOT be freed)
@@ -317,7 +312,6 @@ CELT_EXPORT const char *celt_strerror(int error);
/* @} */
-
#ifdef __cplusplus
}
#endif
diff --git a/libcelt/cwrs.c b/libcelt/cwrs.c
index 940acbe2115d4f3b56e20fe547dcc36743b99e74..dfc943e4b8f45c7d6f3b330ee5076b0df5b82fe2 100644
--- a/libcelt/cwrs.c
+++ b/libcelt/cwrs.c
@@ -71,7 +71,6 @@ int log2_frac(opus_uint32 val, int frac)
#ifndef SMALL_FOOTPRINT
-
#define MASK32 (0xFFFFFFFF)
/*INV_TABLE[i] holds the multiplicative inverse of (2*i+1) mod 2**32.*/
@@ -267,11 +266,6 @@ static inline opus_uint32 imusdiv32even(opus_uint32 _a,opus_uint32 _b,
#ifndef SMALL_FOOTPRINT
-/*Compute U(1,_k).*/
-static inline unsigned ucwrs1(int _k){
- return _k?1:0;
-}
-
/*Compute V(1,_k).*/
static inline unsigned ncwrs1(int _k){
return _k?2:1;
@@ -539,7 +533,6 @@ static void cwrsi(int _n,int _k,opus_uint32 _i,int *_y,opus_uint32 *_u){
while(++j<_n);
}
-
/*Returns the index of the given combination of K elements chosen from a set
of size 1 with associated sign bits.
_y: The vector of pulses, whose sum of absolute values is K.
diff --git a/libcelt/dump_modes.c b/libcelt/dump_modes.c
index a3976936d23672e5dfeced83376045874db74aee..abc84e30de112ecc19d9ef57e6ab095b6e125599 100644
--- a/libcelt/dump_modes.c
+++ b/libcelt/dump_modes.c
@@ -38,7 +38,7 @@
#define INT16 "%d"
#define INT32 "%d"
-#define FLOAT "%f"
+#define FLOAT "%0.9ff"
#ifdef FIXED_POINT
#define WORD16 INT16
@@ -48,7 +48,6 @@
#define WORD32 FLOAT
#endif
-
void dump_modes(FILE *file, CELTMode **modes, int nb_modes)
{
int i, j, k;
@@ -167,7 +166,7 @@ void dump_modes(FILE *file, CELTMode **modes, int nb_modes)
mode->Fs, mdctSize, k);
fprintf (file, "%d,\t/* nfft */\n", mode->mdct.kfft[k]->nfft);
#ifndef FIXED_POINT
- fprintf (file, "%f,\t/* scale */\n", mode->mdct.kfft[k]->scale);
+ fprintf (file, "%0.9ff,\t/* scale */\n", mode->mdct.kfft[k]->scale);
#endif
fprintf (file, "%d,\t/* shift */\n", mode->mdct.kfft[k]->shift);
fprintf (file, "{");
diff --git a/libcelt/ecintrin.h b/libcelt/ecintrin.h
index 3a502c7c8026b640fab63d20aa1faffc6f0e7376..e6a68a57109a3c938f46e7ea84728dca62213975 100644
--- a/libcelt/ecintrin.h
+++ b/libcelt/ecintrin.h
@@ -57,25 +57,7 @@
are just as fast, and do not require any special target architecture.
Earlier gcc versions (3.x) compiled both code to the same assembly
instructions, because of the way they represented ((_b)>(_a)) internally.*/
-#define EC_MAXI(_a,_b) ((_a)-((_a)-(_b)&-((_b)>(_a))))
-#define EC_MINI(_a,_b) ((_a)+((_b)-(_a)&-((_b)<(_a))))
-/*This has a chance of compiling branchless, and is just as fast as the
- bit-twiddling method, which is slightly less portable, since it relies on a
- sign-extended rightshift, which is not guaranteed by ANSI (but present on
- every relevant platform).*/
-#define EC_SIGNI(_a) (((_a)>0)-((_a)<0))
-/*Slightly more portable than relying on a sign-extended right-shift (which is
- not guaranteed by ANSI), and just as fast, since gcc (3.x and 4.x both)
- compile it into the right-shift anyway.*/
-#define EC_SIGNMASK(_a) (-((_a)<0))
-/*Clamps an integer into the given range.
- If _a>_c, then the lower bound _a is respected over the upper bound _c (this
- behavior is required to meet our documented API behavior).
- _a: The lower bound.
- _b: The value to clamp.
- _c: The upper boud.*/
-#define EC_CLAMPI(_a,_b,_c) (EC_MAXI(_a,EC_MINI(_b,_c)))
-
+# define EC_MINI(_a,_b) ((_a)+((_b)-(_a)&-((_b)<(_a))))
/*Count leading zeros.
This macro should only be used for implementing ec_ilog(), if it is defined.
@@ -116,8 +98,6 @@ static __inline int ec_bsr(unsigned long _x){
# define EC_ILOG(_x) (EC_CLZ0-EC_CLZ(_x))
#else
int ec_ilog(opus_uint32 _v);
-
# define EC_ILOG(_x) (ec_ilog(_x))
#endif
-
#endif
diff --git a/libcelt/entcode.c b/libcelt/entcode.c
index e6a6a3ccc1544fc48e880fc519427f4f2f8c4899..984987eeaadda69ba527e86bca484eb8a0bc13f1 100644
--- a/libcelt/entcode.c
+++ b/libcelt/entcode.c
@@ -32,8 +32,6 @@
#include "entcode.h"
#include "arch.h"
-
-
#if !defined(EC_CLZ)
int ec_ilog(opus_uint32 _v){
/*On a Pentium M, this branchless version tested as the fastest on
@@ -59,7 +57,6 @@ int ec_ilog(opus_uint32 _v){
}
#endif
-
opus_uint32 ec_tell_frac(ec_ctx *_this){
opus_uint32 nbits;
opus_uint32 r;
diff --git a/libcelt/entcode.h b/libcelt/entcode.h
index 0da95b7e75de5a007eb3c5a7b012d043a2ba9ff2..2792ada9d133af81623f8960e7a372f56d8396e7 100644
--- a/libcelt/entcode.h
+++ b/libcelt/entcode.h
@@ -33,8 +33,6 @@
# include <stddef.h>
# include "ecintrin.h"
-
-
/*OPT: ec_window must be at least 32 bits, but if you have fast arithmetic on a
larger type, you can speed up the decoder by using it here.*/
typedef opus_uint32 ec_window;
@@ -42,8 +40,6 @@ typedef struct ec_ctx ec_ctx;
typedef struct ec_ctx ec_enc;
typedef struct ec_ctx ec_dec;
-
-
# define EC_WINDOW_SIZE ((int)sizeof(ec_window)*CHAR_BIT)
/*The number of bits to use for the range-coded part of unsigned integers.*/
@@ -53,8 +49,6 @@ typedef struct ec_ctx ec_dec;
3 => 1/8th bits.*/
# define BITRES 3
-
-
/*The entropy encoder/decoder context.
We use the same structure for both, so that common functions like ec_tell()
can be used on either one.*/
@@ -89,12 +83,6 @@ struct ec_ctx{
int error;
};
-
-/*Shared functions.*/
-static inline void ec_reset(ec_ctx *_this){
- _this->offs=_this->end_offs=0;
-}
-
static inline opus_uint32 ec_range_bytes(ec_ctx *_this){
return _this->offs;
}
diff --git a/libcelt/entdec.c b/libcelt/entdec.c
index 83203df806d318d729d2b3be223626e054b22eb0..47d710bd1852d9fc7596bd9f4c1b6e2686224db1 100644
--- a/libcelt/entdec.c
+++ b/libcelt/entdec.c
@@ -35,8 +35,6 @@
#include "entdec.h"
#include "mfrngcod.h"
-
-
/*A range decoder.
This is an entropy decoder based upon \cite{Mar79}, which is itself a
rediscovery of the FIFO arithmetic code introduced by \cite{Pas76}.
@@ -94,8 +92,6 @@
URL="http://www.stanford.edu/class/ee398/handouts/papers/Moffat98ArithmCoding.pdf"
}*/
-
-
static int ec_read_byte(ec_dec *_this){
return _this->offs<_this->storage?_this->buf[_this->offs++]:0;
}
@@ -105,7 +101,6 @@ static int ec_read_byte_from_end(ec_dec *_this){
_this->buf[_this->storage-++(_this->end_offs)]:0;
}
-
/*Normalizes the contents of val and rng so that rng lies entirely in the
high-order symbol.*/
static void ec_dec_normalize(ec_dec *_this){
@@ -144,7 +139,6 @@ void ec_dec_init(ec_dec *_this,unsigned char *_buf,opus_uint32 _storage){
_this->nbits_total=EC_CODE_BITS+1;
}
-
unsigned ec_decode(ec_dec *_this,unsigned _ft){
unsigned s;
_this->ext=_this->rng/_ft;
diff --git a/libcelt/entdec.h b/libcelt/entdec.h
index dfe694d88250c02789a32a048a563887277e6991..719fdb24145bf86a5aab6efc48a0e1e3faa0d5be 100644
--- a/libcelt/entdec.h
+++ b/libcelt/entdec.h
@@ -30,8 +30,6 @@
# include <limits.h>
# include "entcode.h"
-
-
/*Initializes the decoder.
_buf: The input buffer to use.
Return: 0 on success, or a negative value on error.*/
diff --git a/libcelt/entenc.c b/libcelt/entenc.c
index cae1afa858d27f027a3842ff4d75e2048a8f8a5e..62462edb36c089d7192967f996494211f45a36fd 100644
--- a/libcelt/entenc.c
+++ b/libcelt/entenc.c
@@ -33,8 +33,6 @@
#include "entenc.h"
#include "mfrngcod.h"
-
-
/*A range encoder.
See entdec.c and the references for implementation details \cite{Mar79,MNW98}.
@@ -59,8 +57,6 @@
URL="http://www.stanford.edu/class/ee398/handouts/papers/Moffat98ArithmCoding.pdf"
}*/
-
-
static int ec_write_byte(ec_enc *_this,unsigned _value){
if(_this->offs+_this->end_offs>=_this->storage)return -1;
_this->buf[_this->offs++]=(unsigned char)_value;
@@ -73,7 +69,6 @@ static int ec_write_byte_at_end(ec_enc *_this,unsigned _value){
return 0;
}
-
/*Outputs a symbol, with a carry bit.
If there is a potential to propagate a carry over several symbols, they are
buffered until it can be determined whether or not an actual carry will
diff --git a/libcelt/entenc.h b/libcelt/entenc.h
index bc608825426e8bf40f2124a9934deeccaa6abc67..847f77c8530a32249e4912389f1a4d129bce05f8 100644
--- a/libcelt/entenc.h
+++ b/libcelt/entenc.h
@@ -30,8 +30,6 @@
# include <stddef.h>
# include "entcode.h"
-
-
/*Initializes the encoder.
_buf: The buffer to store output bytes in.
_size: The size of the buffer, in chars.*/
diff --git a/libcelt/fixed_c5x.h b/libcelt/fixed_c5x.h
index d7d82eeff8849b1bc651ba1327fd7fa6061a0181..1672f22ac1c90f35e03e95ef10c7986531b37644 100644
--- a/libcelt/fixed_c5x.h
+++ b/libcelt/fixed_c5x.h
@@ -70,20 +70,10 @@ static inline long IMUL32(long i, long j)
#undef MULT16_32_Q15
#define MULT16_32_Q15(a,b) ADD32(SHL(MULT16_16((a),SHR((b),16)),1), SHR(MULT16_16SU((a),(b)),15))
-
#define celt_ilog2(x) (30 - _lnorm(x))
#define OVERRIDE_CELT_ILOG2
#define celt_maxabs16(x, len) MAX16(maxval((DATA *)x, len),-minval((DATA *)x, len))
#define OVERRIDE_CELT_MAXABS16
-#define OVERRIDE_FIND_MAX16
-static inline int find_max16(opus_val16 *x, int len)
-{
- DATA max_corr16 = -VERY_LARGE16;
- DATA pitch16 = 0;
- maxvec((DATA *)x, len, &max_corr16, &pitch16);
- return pitch16;
-}
-
#endif /* FIXED_C5X_H */
diff --git a/libcelt/fixed_c6x.h b/libcelt/fixed_c6x.h
index 48f07e6432a765cfba4d05d3e3f235085a1589e4..746fe081c234b298b1815c0f609ef67aaf7f1d41 100644
--- a/libcelt/fixed_c6x.h
+++ b/libcelt/fixed_c6x.h
@@ -67,14 +67,4 @@
#define celt_maxabs16(x, len) MAX16(maxval((DATA *)x, len),-minval((DATA *)x, len))
#define OVERRIDE_CELT_MAXABS16
-#define OVERRIDE_FIND_MAX16
-static inline int find_max16(opus_val16 *x, int len)
-{
- DATA max_corr16 = -VERY_LARGE16;
- DATA pitch16 = 0;
- maxvec((DATA *)x, len, &max_corr16, &pitch16);
- return pitch16;
-}
-#endif
-
#endif /* FIXED_C6X_H */
diff --git a/libcelt/fixed_debug.h b/libcelt/fixed_debug.h
index de1bb58abe855f320d22bd1f1a8345c7c77ffac6..2f19d10f8d71e3fbc9435a5f781d2539cdf5db67 100644
--- a/libcelt/fixed_debug.h
+++ b/libcelt/fixed_debug.h
@@ -40,8 +40,6 @@ long long celt_mips=0;
extern long long celt_mips;
#endif
-#define MIPS_INC celt_mips++,
-
#define MULT16_16SU(a,b) ((opus_val32)(opus_val16)(a)*(opus_val32)(opus_uint16)(b))
#define MULT32_32_Q31(a,b) ADD32(ADD32(SHL32(MULT16_16(SHR32((a),16),SHR((b),16)),1), SHR32(MULT16_16SU(SHR32((a),16),((b)&0x0000ffff)),15)), SHR32(MULT16_16SU(SHR32((b),16),((a)&0x0000ffff)),15))
@@ -51,7 +49,6 @@ extern long long celt_mips;
#define QCONST16(x,bits) ((opus_val16)(.5+(x)*(((opus_val32)1)<<(bits))))
#define QCONST32(x,bits) ((opus_val32)(.5+(x)*(((opus_val32)1)<<(bits))))
-
#define VERIFY_SHORT(x) ((x)<=32767&&(x)>=-32768)
#define VERIFY_INT(x) ((x)<=2147483647LL&&(x)>=-2147483648LL)
#define VERIFY_UINT(x) ((x)<=(2147483647LLU<<1))
@@ -172,13 +169,9 @@ static inline int SHL32(long long a, int shift)
return res;
}
-#define PSHR16(a,shift) (celt_mips--,SHR16(ADD16((a),((1<<((shift))>>1))),shift))
#define PSHR32(a,shift) (celt_mips--,SHR32(ADD32((a),(((opus_val32)(1)<<((shift))>>1))),shift))
#define VSHR32(a, shift) (((shift)>0) ? SHR32(a, shift) : SHL32(a, -(shift)))
-#define SATURATE16(x,a) (((x)>(a) ? (a) : (x)<-(a) ? -(a) : (x)))
-#define SATURATE32(x,a) (((x)>(a) ? (a) : (x)<-(a) ? -(a) : (x)))
-
#define ROUND16(x,a) (celt_mips--,EXTRACT16(PSHR32((x),(a))))
#define HALF16(x) (SHR16(x,1))
#define HALF32(x) (SHR32(x,1))
@@ -286,8 +279,6 @@ static inline unsigned int _USUB32(unsigned long long a, unsigned long long b, c
return res;
}
-
-
/* result fits in 16 bits */
static inline short MULT16_16_16(int a, int b)
{
@@ -319,10 +310,6 @@ static inline int _MULT16_16(int a, int b, char *file, int line)
}
#define MAC16_16(c,a,b) (celt_mips-=2,ADD32((c),MULT16_16((a),(b))))
-#define MAC16_16_Q11(c,a,b) (ADD16((c),EXTRACT16(SHR32(MULT16_16((a),(b)),11))))
-#define MAC16_16_Q13(c,a,b) (ADD16((c),EXTRACT16(SHR32(MULT16_16((a),(b)),13))))
-#define MAC16_16_P13(c,a,b) (ADD16((c),SHR32(ADD32(4096,MULT16_16((a),(b))),13)))
-
#define MULT16_32_QX(a, b, Q) _MULT16_32_QX(a, b, Q, __FILE__, __LINE__)
static inline int _MULT16_32_QX(int a, long long b, int Q, char *file, int line)
@@ -344,33 +331,7 @@ static inline int _MULT16_32_QX(int a, long long b, int Q, char *file, int line)
return res;
}
-static inline int MULT16_32_PX(int a, long long b, int Q)
-{
- long long res;
- if (!VERIFY_SHORT(a) || !VERIFY_INT(b))
- {
- fprintf (stderr, "MULT16_32_P%d: inputs are not short+int: %d %d\n", Q, (int)a, (int)b);
- }
- if (ABS32(b)>=((opus_val32)(1)<<(15+Q)))
- fprintf (stderr, "MULT16_32_Q%d: second operand too large: %d %d\n", Q, (int)a, (int)b);
- res = ((((long long)a)*(long long)b) + (((opus_val32)(1)<<Q)>>1))>> Q;
- if (!VERIFY_INT(res))
- fprintf (stderr, "MULT16_32_P%d: output is not int: %d*%d=%d\n", Q, (int)a, (int)b,(int)res);
- if (Q==15)
- celt_mips+=4;
- else
- celt_mips+=5;
- return res;
-}
-
-
-#define MULT16_32_Q11(a,b) MULT16_32_QX(a,b,11)
-#define MAC16_32_Q11(c,a,b) ADD32((c),MULT16_32_Q11((a),(b)))
-#define MULT16_32_Q12(a,b) MULT16_32_QX(a,b,12)
-#define MULT16_32_Q13(a,b) MULT16_32_QX(a,b,13)
-#define MULT16_32_Q14(a,b) MULT16_32_QX(a,b,14)
#define MULT16_32_Q15(a,b) MULT16_32_QX(a,b,15)
-#define MULT16_32_P15(a,b) MULT16_32_PX(a,b,15)
#define MAC16_32_Q15(c,a,b) (celt_mips-=2,ADD32((c),MULT16_32_Q15((a),(b))))
static inline int SATURATE(int a, int b)
@@ -543,8 +504,6 @@ static inline int _DIV32(long long a, long long b, char *file, int line)
celt_mips+=70;
return res;
}
-#define PDIV32(a,b) DIV32(ADD32((a),(b)>>1),b)
-#define PDIV32_16(a,b) DIV32_16(ADD32((a),(b)>>1),b)
#undef PRINT_MIPS
#define PRINT_MIPS(file) do {fprintf (file, "total complexity = %llu MIPS\n", celt_mips);} while (0);
diff --git a/libcelt/fixed_generic.h b/libcelt/fixed_generic.h
index b7686168367c97c83857cadcdb53413d705e3fb9..3934f4e06f5ec63b1c20e789734eb34cdbe58168 100644
--- a/libcelt/fixed_generic.h
+++ b/libcelt/fixed_generic.h
@@ -45,11 +45,9 @@
/** 32x32 multiplication, followed by a 31-bit shift right. Results fits in 32 bits */
#define MULT32_32_Q31(a,b) ADD32(ADD32(SHL(MULT16_16(SHR((a),16),SHR((b),16)),1), SHR(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),15)), SHR(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),15))
-/** 32x32 multiplication, followed by a 32-bit shift right. Results fits in 32 bits */
-#define MULT32_32_Q32(a,b) ADD32(ADD32(MULT16_16(SHR((a),16),SHR((b),16)), SHR(MULT16_16SU(SHR((a),16),((b)&0x0000ffff)),16)), SHR(MULT16_16SU(SHR((b),16),((a)&0x0000ffff)),16))
-
/** Compile-time conversion of float constant to 16-bit value */
#define QCONST16(x,bits) ((opus_val16)(.5+(x)*(((opus_val32)1)<<(bits))))
+
/** Compile-time conversion of float constant to 32-bit value */
#define QCONST32(x,bits) ((opus_val32)(.5+(x)*(((opus_val32)1)<<(bits))))
@@ -72,18 +70,11 @@
/** Arithmetic shift-left of a 32-bit value */
#define SHL32(a,shift) ((opus_val32)(a) << (shift))
-/** 16-bit arithmetic shift right with rounding-to-nearest instead of rounding down */
-#define PSHR16(a,shift) (SHR16((a)+((1<<((shift))>>1)),shift))
/** 32-bit arithmetic shift right with rounding-to-nearest instead of rounding down */
#define PSHR32(a,shift) (SHR32((a)+((EXTEND32(1)<<((shift))>>1)),shift))
/** 32-bit arithmetic shift right where the argument can be negative */
#define VSHR32(a, shift) (((shift)>0) ? SHR32(a, shift) : SHL32(a, -(shift)))
-/** Saturates 16-bit value to +/- a */
-#define SATURATE16(x,a) (((x)>(a) ? (a) : (x)<-(a) ? -(a) : (x)))
-/** Saturates 32-bit value to +/- a */
-#define SATURATE32(x,a) (((x)>(a) ? (a) : (x)<-(a) ? -(a) : (x)))
-
/** "RAW" macros, should not be used outside of this header file */
#define SHR(a,shift) ((a) >> (shift))
#define SHL(a,shift) ((opus_val32)(a) << (shift))
@@ -105,7 +96,6 @@
/** Subtract two 32-bit values */
#define SUB32(a,b) ((opus_val32)(a)-(opus_val32)(b))
-
/** 16x16 multiplication where the result fits in 16 bits */
#define MULT16_16_16(a,b) ((((opus_val16)(a))*((opus_val16)(b))))
@@ -115,28 +105,9 @@
/** 16x16 multiply-add where the result fits in 32 bits */
#define MAC16_16(c,a,b) (ADD32((c),MULT16_16((a),(b))))
-/** 16x32 multiplication, followed by a 12-bit shift right. Results fits in 32 bits */
-#define MULT16_32_Q12(a,b) ADD32(MULT16_16((a),SHR((b),12)), SHR(MULT16_16((a),((b)&0x00000fff)),12))
-/** 16x32 multiplication, followed by a 13-bit shift right. Results fits in 32 bits */
-#define MULT16_32_Q13(a,b) ADD32(MULT16_16((a),SHR((b),13)), SHR(MULT16_16((a),((b)&0x00001fff)),13))
-/** 16x32 multiplication, followed by a 14-bit shift right. Results fits in 32 bits */
-#define MULT16_32_Q14(a,b) ADD32(MULT16_16((a),SHR((b),14)), SHR(MULT16_16((a),((b)&0x00003fff)),14))
-
-/** 16x32 multiplication, followed by an 11-bit shift right. Results fits in 32 bits */
-#define MULT16_32_Q11(a,b) ADD32(MULT16_16((a),SHR((b),11)), SHR(MULT16_16((a),((b)&0x000007ff)),11))
-/** 16x32 multiply-add, followed by an 11-bit shift right. Results fits in 32 bits */
-#define MAC16_32_Q11(c,a,b) ADD32(c,ADD32(MULT16_16((a),SHR((b),11)), SHR(MULT16_16((a),((b)&0x000007ff)),11)))
-
-/** 16x32 multiplication, followed by a 15-bit shift right (round-to-nearest). Results fits in 32 bits */
-#define MULT16_32_P15(a,b) ADD32(MULT16_16((a),SHR((b),15)), PSHR(MULT16_16((a),((b)&0x00007fff)),15))
/** 16x32 multiply-add, followed by a 15-bit shift right. Results fits in 32 bits */
#define MAC16_32_Q15(c,a,b) ADD32(c,ADD32(MULT16_16((a),SHR((b),15)), SHR(MULT16_16((a),((b)&0x00007fff)),15)))
-
-#define MAC16_16_Q11(c,a,b) (ADD32((c),SHR(MULT16_16((a),(b)),11)))
-#define MAC16_16_Q13(c,a,b) (ADD32((c),SHR(MULT16_16((a),(b)),13)))
-#define MAC16_16_P13(c,a,b) (ADD32((c),SHR(ADD32(4096,MULT16_16((a),(b))),13)))
-
#define MULT16_16_Q11_32(a,b) (SHR(MULT16_16((a),(b)),11))
#define MULT16_16_Q13(a,b) (SHR(MULT16_16((a),(b)),13))
#define MULT16_16_Q14(a,b) (SHR(MULT16_16((a),(b)),14))
@@ -148,11 +119,8 @@
/** Divide a 32-bit value by a 16-bit value. Result fits in 16 bits */
#define DIV32_16(a,b) ((opus_val16)(((opus_val32)(a))/((opus_val16)(b))))
-/** Divide a 32-bit value by a 16-bit value and round to nearest. Result fits in 16 bits */
-#define PDIV32_16(a,b) ((opus_val16)(((opus_val32)(a)+((opus_val16)(b)>>1))/((opus_val16)(b))))
+
/** Divide a 32-bit value by a 32-bit value. Result fits in 32 bits */
#define DIV32(a,b) (((opus_val32)(a))/((opus_val32)(b)))
-/** Divide a 32-bit value by a 32-bit value and round to nearest. Result fits in 32 bits */
-#define PDIV32(a,b) (((opus_val32)(a)+((opus_val16)(b)>>1))/((opus_val32)(b)))
#endif
diff --git a/libcelt/float_cast.h b/libcelt/float_cast.h
index ad164f74cd919f5f0a3e7d0c1ba1ed96504017b8..b130b88051d3fcacfe6eb81f6c2df79e97e9f12f 100644
--- a/libcelt/float_cast.h
+++ b/libcelt/float_cast.h
@@ -95,7 +95,6 @@
return _mm_cvtss_si32(_mm_load_ss(&value));
}
#elif (defined (WIN32) || defined (_WIN32))
-
#include <math.h>
/* Win32 doesn't seem to have these functions.
@@ -120,12 +119,8 @@
#warning "Don't have the functions lrint() and lrintf ()."
#warning "Replacing these functions with a standard C cast."
#endif /* __GNUC__ */
-
#include <math.h>
-
#define float2int(flt) ((int)(floor(.5+flt)))
-
#endif
-
#endif /* FLOAT_CAST_H */
diff --git a/libcelt/kiss_fft.c b/libcelt/kiss_fft.c
index 5a42f3c916883ffc4d3254eebaaf3894cd0fff3a..98b3effbddee03c9dd39cfd73e295c27dd3f5611 100644
--- a/libcelt/kiss_fft.c
+++ b/libcelt/kiss_fft.c
@@ -292,7 +292,6 @@ static void ki_bfly3(
}
}
-
static void kf_bfly5(
kiss_fft_cpx * Fout,
const size_t fstride,
@@ -462,7 +461,6 @@ static void kf_work(
}
}
-
static void ki_work(
kiss_fft_cpx * Fout,
const kiss_fft_cpx * f,
@@ -493,7 +491,6 @@ static void ki_work(
}
}
-
#ifdef CUSTOM_MODES
static
@@ -529,7 +526,6 @@ void compute_bitrev_table(
}
}
-
/* facbuf is populated by p1,m1,p2,m2, ...
where
p[i] * m[i] = m[i-1]
@@ -582,7 +578,6 @@ static void compute_twiddles(kiss_twiddle_cpx *twiddles, int nfft)
#endif
}
-
/*
*
* User-callable function to allocate all necessary storage space for the fft.
diff --git a/libcelt/kiss_fft.h b/libcelt/kiss_fft.h
index c6ced49082875b9b795f5a9a48f88b08ac615693..ba725121cee8beb12547cf1a33e000cf5037f855 100644
--- a/libcelt/kiss_fft.h
+++ b/libcelt/kiss_fft.h
@@ -14,7 +14,6 @@ Redistribution and use in source and binary forms, with or without modification,
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
#ifndef KISS_FFT_H
#define KISS_FFT_H
@@ -47,7 +46,6 @@ extern "C" {
#define KISS_FFT_MALLOC celt_alloc
#endif
-
#ifdef FIXED_POINT
#include "arch.h"
#define DOUBLE_PRECISION
@@ -157,7 +155,6 @@ void kiss_ifft(const kiss_fft_state *cfg,const kiss_fft_cpx *fin,kiss_fft_cpx *f
void kiss_fft_free(const kiss_fft_state *cfg);
-
#ifdef __cplusplus
}
#endif
diff --git a/libcelt/laplace.c b/libcelt/laplace.c
index 43c6229140d1056b402cec0f61cf250aae442290..c66be0062a8032974bd7fbed49428a7dc7b329bd 100644
--- a/libcelt/laplace.c
+++ b/libcelt/laplace.c
@@ -90,7 +90,6 @@ void ec_laplace_encode(ec_enc *enc, int *value, int fs, int decay)
ec_encode_bin(enc, fl, fl+fs, 15);
}
-
int ec_laplace_decode(ec_dec *dec, int fs, int decay)
{
int val=0;
diff --git a/libcelt/mathops.h b/libcelt/mathops.h
index 28d8649483c86c80f60886323c9fbf3c6ecc872e..6c7fc76a9beac15b3ac2d75c5dc779f5896fa2a8 100644
--- a/libcelt/mathops.h
+++ b/libcelt/mathops.h
@@ -48,7 +48,6 @@ unsigned isqrt32(opus_uint32 _val);
#define celt_sqrt(x) ((float)sqrt(x))
#define celt_rsqrt(x) (1.f/celt_sqrt(x))
#define celt_rsqrt_norm(x) (celt_rsqrt(x))
-#define celt_acos acos
#define celt_exp exp
#define celt_cos_norm(x) ((float)cos((.5f*M_PI)*(x)))
#define celt_atan atan
@@ -106,8 +105,6 @@ static inline float celt_exp2(float x)
#endif
-
-
#ifdef FIXED_POINT
#include "os_support.h"
@@ -121,7 +118,6 @@ static inline opus_int16 celt_ilog2(opus_int32 x)
}
#endif
-
#ifndef OVERRIDE_CELT_MAXABS16
static inline opus_val16 celt_maxabs16(opus_val16 *x, int len)
{
@@ -145,7 +141,6 @@ opus_val32 celt_sqrt(opus_val32 x);
opus_val16 celt_cos_norm(opus_val32 x);
-
static inline opus_val16 celt_log2(opus_val32 x)
{
int i;
@@ -229,6 +224,4 @@ static inline opus_val16 celt_atan2p(opus_val16 y, opus_val16 x)
}
#endif /* FIXED_POINT */
-
-
#endif /* MATHOPS_H */
diff --git a/libcelt/mdct.c b/libcelt/mdct.c
index 37cf6c17e2698d822b3a7c9b5531362a481013d7..41d45cfe25452d13fb8006e6496e599c2a667780 100644
--- a/libcelt/mdct.c
+++ b/libcelt/mdct.c
@@ -53,9 +53,7 @@
#include "mathops.h"
#include "stack_alloc.h"
-#ifndef M_PI
-#define M_PI 3.141592653
-#endif
+#define PI 3.141592653f
#ifdef CUSTOM_MODES
@@ -119,7 +117,7 @@ void clt_mdct_forward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar
#ifdef FIXED_POINT
sine = TRIG_UPSCALE*(QCONST16(0.7853981f, 15)+N2)/N;
#else
- sine = (kiss_twiddle_scalar)2*M_PI*(.125f)/N;
+ sine = (kiss_twiddle_scalar)2*PI*(.125f)/N;
#endif
/* Consider the input to be composed of four blocks: [a, b, c, d] */
@@ -206,7 +204,6 @@ void clt_mdct_forward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar
RESTORE_STACK;
}
-
void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scalar * restrict out, const opus_val16 * restrict window, int overlap, int shift)
{
int i;
@@ -225,7 +222,7 @@ void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scala
#ifdef FIXED_POINT
sine = TRIG_UPSCALE*(QCONST16(0.7853981f, 15)+N2)/N;
#else
- sine = (kiss_twiddle_scalar)2*M_PI*(.125f)/N;
+ sine = (kiss_twiddle_scalar)2*PI*(.125f)/N;
#endif
/* Pre-rotate */
@@ -330,5 +327,3 @@ void clt_mdct_backward(const mdct_lookup *l, kiss_fft_scalar *in, kiss_fft_scala
}
RESTORE_STACK;
}
-
-
diff --git a/libcelt/mfrngcod.h b/libcelt/mfrngcod.h
index 460acbe7f40b20739b159f9d1fc3e26b9073f250..ca94c87e3ee0b6cd99471ec05eeb0d6672622d91 100644
--- a/libcelt/mfrngcod.h
+++ b/libcelt/mfrngcod.h
@@ -43,14 +43,6 @@
# define EC_CODE_TOP (((opus_uint32)1U)<<EC_CODE_BITS-1)
/*Low-order bit of the high-order range symbol.*/
# define EC_CODE_BOT (EC_CODE_TOP>>EC_SYM_BITS)
-/*Code for which propagating carries are possible.*/
-# define EC_CODE_CARRY (((opus_uint32)EC_SYM_MAX)<<EC_CODE_SHIFT)
/*The number of bits available for the last, partial symbol in the code field.*/
# define EC_CODE_EXTRA ((EC_CODE_BITS-2)%EC_SYM_BITS+1)
-/*A mask for the bits available in the coding buffer.
- This allows different platforms to use a variable with more bits, if it is
- convenient.
- We will only use EC_CODE_BITS of it.*/
-# define EC_CODE_MASK ((((opus_uint32)1U)<<EC_CODE_BITS-1)-1<<1|1)
-
#endif
diff --git a/libcelt/modes.c b/libcelt/modes.c
index 28c488b3c22c6d1e93cae22c71c368d4fc8d03d5..7e813a0ec60e7035b844c732eae9db6d9d8752a2 100644
--- a/libcelt/modes.c
+++ b/libcelt/modes.c
@@ -73,7 +73,6 @@ static const unsigned char band_allocation[] = {
#define M_PI 3.141592653
#endif
-
#ifdef CUSTOM_MODES
/* Defining 25 critical bands for the full 0-20 kHz audio bandwidth
diff --git a/libcelt/modes.h b/libcelt/modes.h
index 2bafe8f32497ed513a82921fe0fde486d904c4d1..8ad6a4f6b739f5adff346ee676b410de382e0d83 100644
--- a/libcelt/modes.h
+++ b/libcelt/modes.h
@@ -37,8 +37,6 @@
#include "entenc.h"
#include "entdec.h"
-#define CELT_BITSTREAM_VERSION 0x80000010
-
#define MAX_PERIOD 1024
#ifndef CHANNELS
diff --git a/libcelt/opus_types.h b/libcelt/opus_types.h
index f7933e45c4968a53ccd3568208d9274c686651f3..2c56c4c57770238421369bbbb8e08bd558029d12 100644
--- a/libcelt/opus_types.h
+++ b/libcelt/opus_types.h
@@ -156,5 +156,4 @@
#define opus_uint64 unsigned long long
#define opus_uint8 unsigned char
-
#endif /* _OPUS_TYPES_H */
diff --git a/libcelt/os_support.h b/libcelt/os_support.h
index e80e70002126d6848a126b0b1f55765b5253e5c6..e35c41b63c23ddb2f8147556218f8c06570c66ce 100644
--- a/libcelt/os_support.h
+++ b/libcelt/os_support.h
@@ -42,7 +42,7 @@
/** CELT wrapper for calloc(). To do your own dynamic allocation, all you need to do is replace this function, celt_realloc and celt_free
NOTE: celt_alloc needs to CLEAR THE MEMORY */
#ifndef OVERRIDE_CELT_ALLOC
-static inline void *celt_alloc (int size)
+static inline void *celt_alloc (size_t size)
{
/* WARNING: this is not equivalent to malloc(). If you want to use malloc()
or your own allocator, YOU NEED TO CLEAR THE MEMORY ALLOCATED. Otherwise
@@ -53,7 +53,7 @@ static inline void *celt_alloc (int size)
/** Same as celt_alloc(), except that the area is only needed inside a CELT call (might cause problem with wideband though) */
#ifndef OVERRIDE_CELT_ALLOC_SCRATCH
-static inline void *celt_alloc_scratch (int size)
+static inline void *celt_alloc_scratch (size_t size)
{
/* Scratch space doesn't need to be cleared */
return calloc(size,1);
@@ -68,14 +68,6 @@ static inline void celt_free (void *ptr)
}
#endif
-/** Same as celt_free(), except that the area is only needed inside a CELT call (might cause problem with wideband though) */
-#ifndef OVERRIDE_CELT_FREE_SCRATCH
-static inline void celt_free_scratch (void *ptr)
-{
- free(ptr);
-}
-#endif
-
/** Copy n bytes of memory from src to dst. The 0* term provides compile-time type checking */
#ifndef OVERRIDE_CELT_COPY
#define CELT_COPY(dst, src, n) (memcpy((dst), (src), (n)*sizeof(*(dst)) + 0*((dst)-(src)) ))
diff --git a/libcelt/pitch.c b/libcelt/pitch.c
index 6ade7e3b79037fb2e95bc84cdbcfb62e09505dcd..efd4717138d8dbd25493654d3b0b4d884dc93874 100644
--- a/libcelt/pitch.c
+++ b/libcelt/pitch.c
@@ -31,7 +31,6 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
@@ -279,7 +278,7 @@ opus_val16 remove_doubling(opus_val16 *x, int maxperiod, int minperiod,
g = g0 = VSHR32(MULT16_32_Q15(celt_rsqrt_norm(t), xy),sh+1);
}
#else
- g = g0 = xy/sqrt(1+xx*yy);
+ g = g0 = xy/celt_sqrt(1+xx*yy);
#endif
/* Look for any pitch at T/k */
for (k=2;k<=15;k++)
@@ -320,7 +319,7 @@ opus_val16 remove_doubling(opus_val16 *x, int maxperiod, int minperiod,
g1 = VSHR32(MULT16_32_Q15(celt_rsqrt_norm(t), xy),sh+1);
}
#else
- g1 = xy/sqrt(1+2.f*xx*1.f*yy);
+ g1 = xy/celt_sqrt(1+2.f*xx*1.f*yy);
#endif
if (abs(T1-prev_period)<=1)
cont = prev_gain;
diff --git a/libcelt/pitch.h b/libcelt/pitch.h
index 5d5f92197663369a2e3b10dca8a5f14b65e49e08..bdfa4d0e55868a17964e1610300a9857860fbe71 100644
--- a/libcelt/pitch.h
+++ b/libcelt/pitch.h
@@ -31,7 +31,6 @@
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
#ifndef _PITCH_H
#define _PITCH_H
diff --git a/libcelt/plc.c b/libcelt/plc.c
index 1b3714332da8e849737dac9a21cf86f896693570..2758be96abd8e709b017fef1152210c1156a8197 100644
--- a/libcelt/plc.c
+++ b/libcelt/plc.c
@@ -33,9 +33,6 @@
#include "stack_alloc.h"
#include "mathops.h"
-
-
-
void _celt_lpc(
opus_val16 *_lpc, /* out: [0...p-1] LPC coefficients */
const opus_val32 *ac, /* in: [0...p] autocorrelation values */
diff --git a/libcelt/plc.h b/libcelt/plc.h
index 47635183d72760d42138e34142afaf7e853c3a10..9e2f4479469cb18f51ca43fcb1b8cb468eb71c2e 100644
--- a/libcelt/plc.h
+++ b/libcelt/plc.h
@@ -48,8 +48,6 @@ void iir(const opus_val32 *x,
int ord,
opus_val16 *mem);
-
void _celt_autocorr(const opus_val16 *x, opus_val32 *ac, const opus_val16 *window, int overlap, int lag, int n);
-
#endif /* PLC_H */
diff --git a/libcelt/quant_bands.c b/libcelt/quant_bands.c
index 118fcb1f0c120d1e2b98afa0ceb57dbaba2b5742..2e7e14d9299e6923d6bd57a0572b986a03ac7c0e 100644
--- a/libcelt/quant_bands.c
+++ b/libcelt/quant_bands.c
@@ -432,7 +432,6 @@ void unquant_coarse_energy(const CELTMode *m, int start, int end, opus_val16 *ol
opus_int32 budget;
opus_int32 tell;
-
if (intra)
{
coef = 0;
diff --git a/libcelt/rate.c b/libcelt/rate.c
index da331feb28e0ba505738fb5d63fb2762d0d7ee1c..ecbd9ceb5defa873da30ae610c8a8308bcdb82d7 100644
--- a/libcelt/rate.c
+++ b/libcelt/rate.c
@@ -39,7 +39,6 @@
#include "entcode.h"
#include "rate.h"
-
static const unsigned char LOG2_FRAC_TABLE[24]={
0,
8,13,
@@ -244,7 +243,6 @@ void compute_pulse_cache(CELTMode *m, int LM)
#endif /* CUSTOM_MODES */
-
#define ALLOC_STEPS 6
static inline int interp_bits2pulses(const CELTMode *m, int start, int end, int skip_start,
diff --git a/libcelt/rate.h b/libcelt/rate.h
index 41613f49a3626289fdf0a90ece15a9fbc0bed660..e1346eedf07c8c592914cb28226e9c2455f1de81 100644
--- a/libcelt/rate.h
+++ b/libcelt/rate.h
@@ -40,8 +40,6 @@
#define QTHETA_OFFSET 4
#define QTHETA_OFFSET_TWOPHASE 16
-#define BITOVERFLOW 30000
-
#include "cwrs.h"
#include "modes.h"
@@ -103,5 +101,4 @@ opus_int16 **compute_alloc_cache(CELTMode *m, int M);
int compute_allocation(const CELTMode *m, int start, int end, const int *offsets, const int *cap, int alloc_trim, int *intensity, int *dual_stero,
opus_int32 total, opus_int32 *balance, int *pulses, int *ebits, int *fine_priority, int _C, int LM, ec_ctx *ec, int encode, int prev);
-
#endif
diff --git a/libcelt/stack_alloc.h b/libcelt/stack_alloc.h
index f266526f981fbbac776288c1ba6521002f9a5d27..2d90df4f5f4f658cd5cd4c0f2e813a5ff50cdb9a 100644
--- a/libcelt/stack_alloc.h
+++ b/libcelt/stack_alloc.h
@@ -81,7 +81,6 @@
* @param type Type of element
*/
-
#if defined(VAR_ARRAYS)
#define VARDECL(type, var)
@@ -143,5 +142,4 @@ extern char *global_stack_top;
#endif /*VAR_ARRAYS*/
-
#endif /*STACK_ALLOC_H*/
diff --git a/libcelt/static_modes_float.c b/libcelt/static_modes_float.c
index 9e21a86b729163f1cbca77c7f40742add2925f93..43fa92d14eb742908ef9b0273c10c1459403faf8 100644
--- a/libcelt/static_modes_float.c
+++ b/libcelt/static_modes_float.c
@@ -6,7 +6,7 @@
#ifndef DEF_WINDOW120
#define DEF_WINDOW120
static const opus_val16 window120[120] = {
-0.000067, 0.000606, 0.001682, 0.003295, 0.005444, 0.008128, 0.011344, 0.015091, 0.019365, 0.024164, 0.029483, 0.035320, 0.041669, 0.048525, 0.055884, 0.063738, 0.072082, 0.080907, 0.090208, 0.099974, 0.110198, 0.120869, 0.131977, 0.143512, 0.155462, 0.167814, 0.180555, 0.193673, 0.207152, 0.220977, 0.235132, 0.249602, 0.264369, 0.279414, 0.294720, 0.310268, 0.326038, 0.342009, 0.358162, 0.374474, 0.390925, 0.407491, 0.424152, 0.440884, 0.457665, 0.474471, 0.491280, 0.508068, 0.524813, 0.541491, 0.558080, 0.574557, 0.590900, 0.607088, 0.623100, 0.638913, 0.654509, 0.669868, 0.684971, 0.699800, 0.714339, 0.728571, 0.742480, 0.756054, 0.769279, 0.782143, 0.794634, 0.806744, 0.818465, 0.829787, 0.840707, 0.851218, 0.861317, 0.871002, 0.880271, 0.889125, 0.897564, 0.905591, 0.913209, 0.920423, 0.927237, 0.933660, 0.939697, 0.945357, 0.950649, 0.955584, 0.960171, 0.964422, 0.968349, 0.971963, 0.975279, 0.978309, 0.981066, 0.983565, 0.985819, 0.987842, 0.989649, 0.991253, 0.992669, 0.993910, 0.994990, 0.995923, 0.996722, 0.997399, 0.997967, 0.998437, 0.998822, 0.999132, 0.999376, 0.999565, 0.999708, 0.999812, 0.999886, 0.999936, 0.999967, 0.999985, 0.999995, 0.999999, 1.000000, 1.000000, };
+0.000067000f, 0.000606000f, 0.001682000f, 0.003295000f, 0.005444000f, 0.008128000f, 0.011344000f, 0.015091000f, 0.019365000f, 0.024164001f, 0.029483000f, 0.035319999f, 0.041669000f, 0.048525002f, 0.055884000f, 0.063738003f, 0.072081998f, 0.080907002f, 0.090208001f, 0.099973999f, 0.110197999f, 0.120869003f, 0.131977007f, 0.143511996f, 0.155461997f, 0.167814001f, 0.180555001f, 0.193673000f, 0.207151994f, 0.220976993f, 0.235131994f, 0.249602005f, 0.264369011f, 0.279413998f, 0.294719994f, 0.310268015f, 0.326038003f, 0.342009008f, 0.358161986f, 0.374473989f, 0.390924990f, 0.407490999f, 0.424151987f, 0.440883994f, 0.457664996f, 0.474471003f, 0.491279989f, 0.508068025f, 0.524812996f, 0.541490972f, 0.558080018f, 0.574557006f, 0.590900004f, 0.607088029f, 0.623099983f, 0.638912976f, 0.654509008f, 0.669867992f, 0.684970975f, 0.699800014f, 0.714339018f, 0.728570998f, 0.742479980f, 0.756053984f, 0.769279003f, 0.782142997f, 0.794633985f, 0.806743979f, 0.818464994f, 0.829787016f, 0.840707004f, 0.851217985f, 0.861316979f, 0.871002018f, 0.880271018f, 0.889124990f, 0.897563994f, 0.905591011f, 0.913209021f, 0.920422971f, 0.927236974f, 0.933659971f, 0.939697027f, 0.945357025f, 0.950649023f, 0.955583990f, 0.960170984f, 0.964421988f, 0.968348980f, 0.971962988f, 0.975278974f, 0.978308976f, 0.981065989f, 0.983564973f, 0.985818982f, 0.987842023f, 0.989648998f, 0.991253018f, 0.992668986f, 0.993910015f, 0.994989991f, 0.995922983f, 0.996721983f, 0.997398973f, 0.997967005f, 0.998436987f, 0.998821974f, 0.999131978f, 0.999375999f, 0.999565005f, 0.999707997f, 0.999812007f, 0.999885976f, 0.999935985f, 0.999966979f, 0.999984980f, 0.999994993f, 0.999998987f, 1.000000000f, 1.000000000f, };
#endif
#ifndef DEF_LOGN400
@@ -28,7 +28,7 @@ static const unsigned char cache_caps50[168] = {
#ifndef FFT_TWIDDLES48000_960
#define FFT_TWIDDLES48000_960
static const kiss_twiddle_cpx fft_twiddles48000_960[480] = {
-{1.000000, -0.000000}, {0.999914, -0.013090}, {0.999657, -0.026177}, {0.999229, -0.039260}, {0.998630, -0.052336}, {0.997859, -0.065403}, {0.996917, -0.078459}, {0.995805, -0.091502}, {0.994522, -0.104528}, {0.993068, -0.117537}, {0.991445, -0.130526}, {0.989651, -0.143493}, {0.987688, -0.156434}, {0.985556, -0.169350}, {0.983255, -0.182236}, {0.980785, -0.195090}, {0.978148, -0.207912}, {0.975342, -0.220697}, {0.972370, -0.233445}, {0.969231, -0.246153}, {0.965926, -0.258819}, {0.962455, -0.271440}, {0.958820, -0.284015}, {0.955020, -0.296542}, {0.951057, -0.309017}, {0.946930, -0.321439}, {0.942641, -0.333807}, {0.938191, -0.346117}, {0.933580, -0.358368}, {0.928810, -0.370557}, {0.923880, -0.382683}, {0.918791, -0.394744}, {0.913545, -0.406737}, {0.908143, -0.418660}, {0.902585, -0.430511}, {0.896873, -0.442289}, {0.891007, -0.453990}, {0.884988, -0.465615}, {0.878817, -0.477159}, {0.872496, -0.488621}, {0.866025, -0.500000}, {0.859406, -0.511293}, {0.852640, -0.522499}, {0.845728, -0.533615}, {0.838671, -0.544639}, {0.831470, -0.555570}, {0.824126, -0.566406}, {0.816642, -0.577145}, {0.809017, -0.587785}, {0.801254, -0.598325}, {0.793353, -0.608761}, {0.785317, -0.619094}, {0.777146, -0.629320}, {0.768842, -0.639439}, {0.760406, -0.649448}, {0.751840, -0.659346}, {0.743145, -0.669131}, {0.734322, -0.678801}, {0.725374, -0.688355}, {0.716302, -0.697790}, {0.707107, -0.707107}, {0.697790, -0.716302}, {0.688355, -0.725374}, {0.678801, -0.734322}, {0.669131, -0.743145}, {0.659346, -0.751840}, {0.649448, -0.760406}, {0.639439, -0.768842}, {0.629320, -0.777146}, {0.619094, -0.785317}, {0.608761, -0.793353}, {0.598325, -0.801254}, {0.587785, -0.809017}, {0.577145, -0.816642}, {0.566406, -0.824126}, {0.555570, -0.831470}, {0.544639, -0.838671}, {0.533615, -0.845728}, {0.522499, -0.852640}, {0.511293, -0.859406}, {0.500000, -0.866025}, {0.488621, -0.872496}, {0.477159, -0.878817}, {0.465615, -0.884988}, {0.453990, -0.891007}, {0.442289, -0.896873}, {0.430511, -0.902585}, {0.418660, -0.908143}, {0.406737, -0.913545}, {0.394744, -0.918791}, {0.382683, -0.923880}, {0.370557, -0.928810}, {0.358368, -0.933580}, {0.346117, -0.938191}, {0.333807, -0.942641}, {0.321439, -0.946930}, {0.309017, -0.951057}, {0.296542, -0.955020}, {0.284015, -0.958820}, {0.271440, -0.962455}, {0.258819, -0.965926}, {0.246153, -0.969231}, {0.233445, -0.972370}, {0.220697, -0.975342}, {0.207912, -0.978148}, {0.195090, -0.980785}, {0.182236, -0.983255}, {0.169350, -0.985556}, {0.156434, -0.987688}, {0.143493, -0.989651}, {0.130526, -0.991445}, {0.117537, -0.993068}, {0.104528, -0.994522}, {0.091502, -0.995805}, {0.078459, -0.996917}, {0.065403, -0.997859}, {0.052336, -0.998630}, {0.039260, -0.999229}, {0.026177, -0.999657}, {0.013090, -0.999914}, {0.000000, -1.000000}, {-0.013090, -0.999914}, {-0.026177, -0.999657}, {-0.039260, -0.999229}, {-0.052336, -0.998630}, {-0.065403, -0.997859}, {-0.078459, -0.996917}, {-0.091502, -0.995805}, {-0.104528, -0.994522}, {-0.117537, -0.993068}, {-0.130526, -0.991445}, {-0.143493, -0.989651}, {-0.156434, -0.987688}, {-0.169350, -0.985556}, {-0.182236, -0.983255}, {-0.195090, -0.980785}, {-0.207912, -0.978148}, {-0.220697, -0.975342}, {-0.233445, -0.972370}, {-0.246153, -0.969231}, {-0.258819, -0.965926}, {-0.271440, -0.962455}, {-0.284015, -0.958820}, {-0.296542, -0.955020}, {-0.309017, -0.951057}, {-0.321439, -0.946930}, {-0.333807, -0.942641}, {-0.346117, -0.938191}, {-0.358368, -0.933580}, {-0.370557, -0.928810}, {-0.382683, -0.923880}, {-0.394744, -0.918791}, {-0.406737, -0.913545}, {-0.418660, -0.908143}, {-0.430511, -0.902585}, {-0.442289, -0.896873}, {-0.453990, -0.891007}, {-0.465615, -0.884988}, {-0.477159, -0.878817}, {-0.488621, -0.872496}, {-0.500000, -0.866025}, {-0.511293, -0.859406}, {-0.522499, -0.852640}, {-0.533615, -0.845728}, {-0.544639, -0.838671}, {-0.555570, -0.831470}, {-0.566406, -0.824126}, {-0.577145, -0.816642}, {-0.587785, -0.809017}, {-0.598325, -0.801254}, {-0.608761, -0.793353}, {-0.619094, -0.785317}, {-0.629320, -0.777146}, {-0.639439, -0.768842}, {-0.649448, -0.760406}, {-0.659346, -0.751840}, {-0.669131, -0.743145}, {-0.678801, -0.734322}, {-0.688355, -0.725374}, {-0.697790, -0.716302}, {-0.707107, -0.707107}, {-0.716302, -0.697790}, {-0.725374, -0.688355}, {-0.734322, -0.678801}, {-0.743145, -0.669131}, {-0.751840, -0.659346}, {-0.760406, -0.649448}, {-0.768842, -0.639439}, {-0.777146, -0.629320}, {-0.785317, -0.619094}, {-0.793353, -0.608761}, {-0.801254, -0.598325}, {-0.809017, -0.587785}, {-0.816642, -0.577145}, {-0.824126, -0.566406}, {-0.831470, -0.555570}, {-0.838671, -0.544639}, {-0.845728, -0.533615}, {-0.852640, -0.522499}, {-0.859406, -0.511293}, {-0.866025, -0.500000}, {-0.872496, -0.488621}, {-0.878817, -0.477159}, {-0.884988, -0.465615}, {-0.891007, -0.453990}, {-0.896873, -0.442289}, {-0.902585, -0.430511}, {-0.908143, -0.418660}, {-0.913545, -0.406737}, {-0.918791, -0.394744}, {-0.923880, -0.382683}, {-0.928810, -0.370557}, {-0.933580, -0.358368}, {-0.938191, -0.346117}, {-0.942641, -0.333807}, {-0.946930, -0.321439}, {-0.951057, -0.309017}, {-0.955020, -0.296542}, {-0.958820, -0.284015}, {-0.962455, -0.271440}, {-0.965926, -0.258819}, {-0.969231, -0.246153}, {-0.972370, -0.233445}, {-0.975342, -0.220697}, {-0.978148, -0.207912}, {-0.980785, -0.195090}, {-0.983255, -0.182236}, {-0.985556, -0.169350}, {-0.987688, -0.156434}, {-0.989651, -0.143493}, {-0.991445, -0.130526}, {-0.993068, -0.117537}, {-0.994522, -0.104528}, {-0.995805, -0.091502}, {-0.996917, -0.078459}, {-0.997859, -0.065403}, {-0.998630, -0.052336}, {-0.999229, -0.039260}, {-0.999657, -0.026177}, {-0.999914, -0.013090}, {-1.000000, -0.000000}, {-0.999914, 0.013090}, {-0.999657, 0.026177}, {-0.999229, 0.039260}, {-0.998630, 0.052336}, {-0.997859, 0.065403}, {-0.996917, 0.078459}, {-0.995805, 0.091502}, {-0.994522, 0.104528}, {-0.993068, 0.117537}, {-0.991445, 0.130526}, {-0.989651, 0.143493}, {-0.987688, 0.156434}, {-0.985556, 0.169350}, {-0.983255, 0.182236}, {-0.980785, 0.195090}, {-0.978148, 0.207912}, {-0.975342, 0.220697}, {-0.972370, 0.233445}, {-0.969231, 0.246153}, {-0.965926, 0.258819}, {-0.962455, 0.271440}, {-0.958820, 0.284015}, {-0.955020, 0.296542}, {-0.951057, 0.309017}, {-0.946930, 0.321439}, {-0.942641, 0.333807}, {-0.938191, 0.346117}, {-0.933580, 0.358368}, {-0.928810, 0.370557}, {-0.923880, 0.382683}, {-0.918791, 0.394744}, {-0.913545, 0.406737}, {-0.908143, 0.418660}, {-0.902585, 0.430511}, {-0.896873, 0.442289}, {-0.891007, 0.453990}, {-0.884988, 0.465615}, {-0.878817, 0.477159}, {-0.872496, 0.488621}, {-0.866025, 0.500000}, {-0.859406, 0.511293}, {-0.852640, 0.522499}, {-0.845728, 0.533615}, {-0.838671, 0.544639}, {-0.831470, 0.555570}, {-0.824126, 0.566406}, {-0.816642, 0.577145}, {-0.809017, 0.587785}, {-0.801254, 0.598325}, {-0.793353, 0.608761}, {-0.785317, 0.619094}, {-0.777146, 0.629320}, {-0.768842, 0.639439}, {-0.760406, 0.649448}, {-0.751840, 0.659346}, {-0.743145, 0.669131}, {-0.734322, 0.678801}, {-0.725374, 0.688355}, {-0.716302, 0.697790}, {-0.707107, 0.707107}, {-0.697790, 0.716302}, {-0.688355, 0.725374}, {-0.678801, 0.734322}, {-0.669131, 0.743145}, {-0.659346, 0.751840}, {-0.649448, 0.760406}, {-0.639439, 0.768842}, {-0.629320, 0.777146}, {-0.619094, 0.785317}, {-0.608761, 0.793353}, {-0.598325, 0.801254}, {-0.587785, 0.809017}, {-0.577145, 0.816642}, {-0.566406, 0.824126}, {-0.555570, 0.831470}, {-0.544639, 0.838671}, {-0.533615, 0.845728}, {-0.522499, 0.852640}, {-0.511293, 0.859406}, {-0.500000, 0.866025}, {-0.488621, 0.872496}, {-0.477159, 0.878817}, {-0.465615, 0.884988}, {-0.453990, 0.891007}, {-0.442289, 0.896873}, {-0.430511, 0.902585}, {-0.418660, 0.908143}, {-0.406737, 0.913545}, {-0.394744, 0.918791}, {-0.382683, 0.923880}, {-0.370557, 0.928810}, {-0.358368, 0.933580}, {-0.346117, 0.938191}, {-0.333807, 0.942641}, {-0.321439, 0.946930}, {-0.309017, 0.951057}, {-0.296542, 0.955020}, {-0.284015, 0.958820}, {-0.271440, 0.962455}, {-0.258819, 0.965926}, {-0.246153, 0.969231}, {-0.233445, 0.972370}, {-0.220697, 0.975342}, {-0.207912, 0.978148}, {-0.195090, 0.980785}, {-0.182236, 0.983255}, {-0.169350, 0.985556}, {-0.156434, 0.987688}, {-0.143493, 0.989651}, {-0.130526, 0.991445}, {-0.117537, 0.993068}, {-0.104528, 0.994522}, {-0.091502, 0.995805}, {-0.078459, 0.996917}, {-0.065403, 0.997859}, {-0.052336, 0.998630}, {-0.039260, 0.999229}, {-0.026177, 0.999657}, {-0.013090, 0.999914}, {-0.000000, 1.000000}, {0.013090, 0.999914}, {0.026177, 0.999657}, {0.039260, 0.999229}, {0.052336, 0.998630}, {0.065403, 0.997859}, {0.078459, 0.996917}, {0.091502, 0.995805}, {0.104528, 0.994522}, {0.117537, 0.993068}, {0.130526, 0.991445}, {0.143493, 0.989651}, {0.156434, 0.987688}, {0.169350, 0.985556}, {0.182236, 0.983255}, {0.195090, 0.980785}, {0.207912, 0.978148}, {0.220697, 0.975342}, {0.233445, 0.972370}, {0.246153, 0.969231}, {0.258819, 0.965926}, {0.271440, 0.962455}, {0.284015, 0.958820}, {0.296542, 0.955020}, {0.309017, 0.951057}, {0.321439, 0.946930}, {0.333807, 0.942641}, {0.346117, 0.938191}, {0.358368, 0.933580}, {0.370557, 0.928810}, {0.382683, 0.923880}, {0.394744, 0.918791}, {0.406737, 0.913545}, {0.418660, 0.908143}, {0.430511, 0.902585}, {0.442289, 0.896873}, {0.453990, 0.891007}, {0.465615, 0.884988}, {0.477159, 0.878817}, {0.488621, 0.872496}, {0.500000, 0.866025}, {0.511293, 0.859406}, {0.522499, 0.852640}, {0.533615, 0.845728}, {0.544639, 0.838671}, {0.555570, 0.831470}, {0.566406, 0.824126}, {0.577145, 0.816642}, {0.587785, 0.809017}, {0.598325, 0.801254}, {0.608761, 0.793353}, {0.619094, 0.785317}, {0.629320, 0.777146}, {0.639439, 0.768842}, {0.649448, 0.760406}, {0.659346, 0.751840}, {0.669131, 0.743145}, {0.678801, 0.734322}, {0.688355, 0.725374}, {0.697790, 0.716302}, {0.707107, 0.707107}, {0.716302, 0.697790}, {0.725374, 0.688355}, {0.734322, 0.678801}, {0.743145, 0.669131}, {0.751840, 0.659346}, {0.760406, 0.649448}, {0.768842, 0.639439}, {0.777146, 0.629320}, {0.785317, 0.619094}, {0.793353, 0.608761}, {0.801254, 0.598325}, {0.809017, 0.587785}, {0.816642, 0.577145}, {0.824126, 0.566406}, {0.831470, 0.555570}, {0.838671, 0.544639}, {0.845728, 0.533615}, {0.852640, 0.522499}, {0.859406, 0.511293}, {0.866025, 0.500000}, {0.872496, 0.488621}, {0.878817, 0.477159}, {0.884988, 0.465615}, {0.891007, 0.453990}, {0.896873, 0.442289}, {0.902585, 0.430511}, {0.908143, 0.418660}, {0.913545, 0.406737}, {0.918791, 0.394744}, {0.923880, 0.382683}, {0.928810, 0.370557}, {0.933580, 0.358368}, {0.938191, 0.346117}, {0.942641, 0.333807}, {0.946930, 0.321439}, {0.951057, 0.309017}, {0.955020, 0.296542}, {0.958820, 0.284015}, {0.962455, 0.271440}, {0.965926, 0.258819}, {0.969231, 0.246153}, {0.972370, 0.233445}, {0.975342, 0.220697}, {0.978148, 0.207912}, {0.980785, 0.195090}, {0.983255, 0.182236}, {0.985556, 0.169350}, {0.987688, 0.156434}, {0.989651, 0.143493}, {0.991445, 0.130526}, {0.993068, 0.117537}, {0.994522, 0.104528}, {0.995805, 0.091502}, {0.996917, 0.078459}, {0.997859, 0.065403}, {0.998630, 0.052336}, {0.999229, 0.039260}, {0.999657, 0.026177}, {0.999914, 0.013090}, };
+{1.000000000f, -0.000000000f}, {0.999913990f, -0.013090000f}, {0.999656975f, -0.026177000f}, {0.999229014f, -0.039260000f}, {0.998629987f, -0.052336000f}, {0.997859001f, -0.065403000f}, {0.996917009f, -0.078459002f}, {0.995805025f, -0.091502003f}, {0.994521976f, -0.104528002f}, {0.993067980f, -0.117536999f}, {0.991445005f, -0.130526006f}, {0.989651024f, -0.143492997f}, {0.987688005f, -0.156434000f}, {0.985556006f, -0.169349998f}, {0.983255029f, -0.182236001f}, {0.980785012f, -0.195089996f}, {0.978147984f, -0.207911998f}, {0.975341976f, -0.220697001f}, {0.972370028f, -0.233445004f}, {0.969231009f, -0.246152997f}, {0.965925992f, -0.258819014f}, {0.962454975f, -0.271439999f}, {0.958819985f, -0.284015000f}, {0.955020010f, -0.296541989f}, {0.951057017f, -0.309017003f}, {0.946929991f, -0.321438998f}, {0.942641020f, -0.333806992f}, {0.938190997f, -0.346116990f}, {0.933579981f, -0.358368009f}, {0.928810000f, -0.370557010f}, {0.923879981f, -0.382683009f}, {0.918790996f, -0.394744009f}, {0.913545012f, -0.406737000f}, {0.908142984f, -0.418660015f}, {0.902585030f, -0.430510998f}, {0.896872997f, -0.442288995f}, {0.891007006f, -0.453990012f}, {0.884988010f, -0.465615004f}, {0.878817022f, -0.477158993f}, {0.872496009f, -0.488620996f}, {0.866024971f, -0.500000000f}, {0.859405994f, -0.511292994f}, {0.852639973f, -0.522499025f}, {0.845727980f, -0.533614993f}, {0.838671029f, -0.544638991f}, {0.831470013f, -0.555570006f}, {0.824126005f, -0.566406012f}, {0.816641986f, -0.577144980f}, {0.809017003f, -0.587785006f}, {0.801253974f, -0.598325014f}, {0.793353021f, -0.608761013f}, {0.785317004f, -0.619094014f}, {0.777145982f, -0.629320025f}, {0.768841982f, -0.639438987f}, {0.760406017f, -0.649447978f}, {0.751839995f, -0.659345984f}, {0.743144989f, -0.669130981f}, {0.734322011f, -0.678801000f}, {0.725373983f, -0.688355029f}, {0.716301978f, -0.697790027f}, {0.707107008f, -0.707107008f}, {0.697790027f, -0.716301978f}, {0.688355029f, -0.725373983f}, {0.678801000f, -0.734322011f}, {0.669130981f, -0.743144989f}, {0.659345984f, -0.751839995f}, {0.649447978f, -0.760406017f}, {0.639438987f, -0.768841982f}, {0.629320025f, -0.777145982f}, {0.619094014f, -0.785317004f}, {0.608761013f, -0.793353021f}, {0.598325014f, -0.801253974f}, {0.587785006f, -0.809017003f}, {0.577144980f, -0.816641986f}, {0.566406012f, -0.824126005f}, {0.555570006f, -0.831470013f}, {0.544638991f, -0.838671029f}, {0.533614993f, -0.845727980f}, {0.522499025f, -0.852639973f}, {0.511292994f, -0.859405994f}, {0.500000000f, -0.866024971f}, {0.488620996f, -0.872496009f}, {0.477158993f, -0.878817022f}, {0.465615004f, -0.884988010f}, {0.453990012f, -0.891007006f}, {0.442288995f, -0.896872997f}, {0.430510998f, -0.902585030f}, {0.418660015f, -0.908142984f}, {0.406737000f, -0.913545012f}, {0.394744009f, -0.918790996f}, {0.382683009f, -0.923879981f}, {0.370557010f, -0.928810000f}, {0.358368009f, -0.933579981f}, {0.346116990f, -0.938190997f}, {0.333806992f, -0.942641020f}, {0.321438998f, -0.946929991f}, {0.309017003f, -0.951057017f}, {0.296541989f, -0.955020010f}, {0.284015000f, -0.958819985f}, {0.271439999f, -0.962454975f}, {0.258819014f, -0.965925992f}, {0.246152997f, -0.969231009f}, {0.233445004f, -0.972370028f}, {0.220697001f, -0.975341976f}, {0.207911998f, -0.978147984f}, {0.195089996f, -0.980785012f}, {0.182236001f, -0.983255029f}, {0.169349998f, -0.985556006f}, {0.156434000f, -0.987688005f}, {0.143492997f, -0.989651024f}, {0.130526006f, -0.991445005f}, {0.117536999f, -0.993067980f}, {0.104528002f, -0.994521976f}, {0.091502003f, -0.995805025f}, {0.078459002f, -0.996917009f}, {0.065403000f, -0.997859001f}, {0.052336000f, -0.998629987f}, {0.039260000f, -0.999229014f}, {0.026177000f, -0.999656975f}, {0.013090000f, -0.999913990f}, {0.000000000f, -1.000000000f}, {-0.013090000f, -0.999913990f}, {-0.026177000f, -0.999656975f}, {-0.039260000f, -0.999229014f}, {-0.052336000f, -0.998629987f}, {-0.065403000f, -0.997859001f}, {-0.078459002f, -0.996917009f}, {-0.091502003f, -0.995805025f}, {-0.104528002f, -0.994521976f}, {-0.117536999f, -0.993067980f}, {-0.130526006f, -0.991445005f}, {-0.143492997f, -0.989651024f}, {-0.156434000f, -0.987688005f}, {-0.169349998f, -0.985556006f}, {-0.182236001f, -0.983255029f}, {-0.195089996f, -0.980785012f}, {-0.207911998f, -0.978147984f}, {-0.220697001f, -0.975341976f}, {-0.233445004f, -0.972370028f}, {-0.246152997f, -0.969231009f}, {-0.258819014f, -0.965925992f}, {-0.271439999f, -0.962454975f}, {-0.284015000f, -0.958819985f}, {-0.296541989f, -0.955020010f}, {-0.309017003f, -0.951057017f}, {-0.321438998f, -0.946929991f}, {-0.333806992f, -0.942641020f}, {-0.346116990f, -0.938190997f}, {-0.358368009f, -0.933579981f}, {-0.370557010f, -0.928810000f}, {-0.382683009f, -0.923879981f}, {-0.394744009f, -0.918790996f}, {-0.406737000f, -0.913545012f}, {-0.418660015f, -0.908142984f}, {-0.430510998f, -0.902585030f}, {-0.442288995f, -0.896872997f}, {-0.453990012f, -0.891007006f}, {-0.465615004f, -0.884988010f}, {-0.477158993f, -0.878817022f}, {-0.488620996f, -0.872496009f}, {-0.500000000f, -0.866024971f}, {-0.511292994f, -0.859405994f}, {-0.522499025f, -0.852639973f}, {-0.533614993f, -0.845727980f}, {-0.544638991f, -0.838671029f}, {-0.555570006f, -0.831470013f}, {-0.566406012f, -0.824126005f}, {-0.577144980f, -0.816641986f}, {-0.587785006f, -0.809017003f}, {-0.598325014f, -0.801253974f}, {-0.608761013f, -0.793353021f}, {-0.619094014f, -0.785317004f}, {-0.629320025f, -0.777145982f}, {-0.639438987f, -0.768841982f}, {-0.649447978f, -0.760406017f}, {-0.659345984f, -0.751839995f}, {-0.669130981f, -0.743144989f}, {-0.678801000f, -0.734322011f}, {-0.688355029f, -0.725373983f}, {-0.697790027f, -0.716301978f}, {-0.707107008f, -0.707107008f}, {-0.716301978f, -0.697790027f}, {-0.725373983f, -0.688355029f}, {-0.734322011f, -0.678801000f}, {-0.743144989f, -0.669130981f}, {-0.751839995f, -0.659345984f}, {-0.760406017f, -0.649447978f}, {-0.768841982f, -0.639438987f}, {-0.777145982f, -0.629320025f}, {-0.785317004f, -0.619094014f}, {-0.793353021f, -0.608761013f}, {-0.801253974f, -0.598325014f}, {-0.809017003f, -0.587785006f}, {-0.816641986f, -0.577144980f}, {-0.824126005f, -0.566406012f}, {-0.831470013f, -0.555570006f}, {-0.838671029f, -0.544638991f}, {-0.845727980f, -0.533614993f}, {-0.852639973f, -0.522499025f}, {-0.859405994f, -0.511292994f}, {-0.866024971f, -0.500000000f}, {-0.872496009f, -0.488620996f}, {-0.878817022f, -0.477158993f}, {-0.884988010f, -0.465615004f}, {-0.891007006f, -0.453990012f}, {-0.896872997f, -0.442288995f}, {-0.902585030f, -0.430510998f}, {-0.908142984f, -0.418660015f}, {-0.913545012f, -0.406737000f}, {-0.918790996f, -0.394744009f}, {-0.923879981f, -0.382683009f}, {-0.928810000f, -0.370557010f}, {-0.933579981f, -0.358368009f}, {-0.938190997f, -0.346116990f}, {-0.942641020f, -0.333806992f}, {-0.946929991f, -0.321438998f}, {-0.951057017f, -0.309017003f}, {-0.955020010f, -0.296541989f}, {-0.958819985f, -0.284015000f}, {-0.962454975f, -0.271439999f}, {-0.965925992f, -0.258819014f}, {-0.969231009f, -0.246152997f}, {-0.972370028f, -0.233445004f}, {-0.975341976f, -0.220697001f}, {-0.978147984f, -0.207911998f}, {-0.980785012f, -0.195089996f}, {-0.983255029f, -0.182236001f}, {-0.985556006f, -0.169349998f}, {-0.987688005f, -0.156434000f}, {-0.989651024f, -0.143492997f}, {-0.991445005f, -0.130526006f}, {-0.993067980f, -0.117536999f}, {-0.994521976f, -0.104528002f}, {-0.995805025f, -0.091502003f}, {-0.996917009f, -0.078459002f}, {-0.997859001f, -0.065403000f}, {-0.998629987f, -0.052336000f}, {-0.999229014f, -0.039260000f}, {-0.999656975f, -0.026177000f}, {-0.999913990f, -0.013090000f}, {-1.000000000f, -0.000000000f}, {-0.999913990f, 0.013090000f}, {-0.999656975f, 0.026177000f}, {-0.999229014f, 0.039260000f}, {-0.998629987f, 0.052336000f}, {-0.997859001f, 0.065403000f}, {-0.996917009f, 0.078459002f}, {-0.995805025f, 0.091502003f}, {-0.994521976f, 0.104528002f}, {-0.993067980f, 0.117536999f}, {-0.991445005f, 0.130526006f}, {-0.989651024f, 0.143492997f}, {-0.987688005f, 0.156434000f}, {-0.985556006f, 0.169349998f}, {-0.983255029f, 0.182236001f}, {-0.980785012f, 0.195089996f}, {-0.978147984f, 0.207911998f}, {-0.975341976f, 0.220697001f}, {-0.972370028f, 0.233445004f}, {-0.969231009f, 0.246152997f}, {-0.965925992f, 0.258819014f}, {-0.962454975f, 0.271439999f}, {-0.958819985f, 0.284015000f}, {-0.955020010f, 0.296541989f}, {-0.951057017f, 0.309017003f}, {-0.946929991f, 0.321438998f}, {-0.942641020f, 0.333806992f}, {-0.938190997f, 0.346116990f}, {-0.933579981f, 0.358368009f}, {-0.928810000f, 0.370557010f}, {-0.923879981f, 0.382683009f}, {-0.918790996f, 0.394744009f}, {-0.913545012f, 0.406737000f}, {-0.908142984f, 0.418660015f}, {-0.902585030f, 0.430510998f}, {-0.896872997f, 0.442288995f}, {-0.891007006f, 0.453990012f}, {-0.884988010f, 0.465615004f}, {-0.878817022f, 0.477158993f}, {-0.872496009f, 0.488620996f}, {-0.866024971f, 0.500000000f}, {-0.859405994f, 0.511292994f}, {-0.852639973f, 0.522499025f}, {-0.845727980f, 0.533614993f}, {-0.838671029f, 0.544638991f}, {-0.831470013f, 0.555570006f}, {-0.824126005f, 0.566406012f}, {-0.816641986f, 0.577144980f}, {-0.809017003f, 0.587785006f}, {-0.801253974f, 0.598325014f}, {-0.793353021f, 0.608761013f}, {-0.785317004f, 0.619094014f}, {-0.777145982f, 0.629320025f}, {-0.768841982f, 0.639438987f}, {-0.760406017f, 0.649447978f}, {-0.751839995f, 0.659345984f}, {-0.743144989f, 0.669130981f}, {-0.734322011f, 0.678801000f}, {-0.725373983f, 0.688355029f}, {-0.716301978f, 0.697790027f}, {-0.707107008f, 0.707107008f}, {-0.697790027f, 0.716301978f}, {-0.688355029f, 0.725373983f}, {-0.678801000f, 0.734322011f}, {-0.669130981f, 0.743144989f}, {-0.659345984f, 0.751839995f}, {-0.649447978f, 0.760406017f}, {-0.639438987f, 0.768841982f}, {-0.629320025f, 0.777145982f}, {-0.619094014f, 0.785317004f}, {-0.608761013f, 0.793353021f}, {-0.598325014f, 0.801253974f}, {-0.587785006f, 0.809017003f}, {-0.577144980f, 0.816641986f}, {-0.566406012f, 0.824126005f}, {-0.555570006f, 0.831470013f}, {-0.544638991f, 0.838671029f}, {-0.533614993f, 0.845727980f}, {-0.522499025f, 0.852639973f}, {-0.511292994f, 0.859405994f}, {-0.500000000f, 0.866024971f}, {-0.488620996f, 0.872496009f}, {-0.477158993f, 0.878817022f}, {-0.465615004f, 0.884988010f}, {-0.453990012f, 0.891007006f}, {-0.442288995f, 0.896872997f}, {-0.430510998f, 0.902585030f}, {-0.418660015f, 0.908142984f}, {-0.406737000f, 0.913545012f}, {-0.394744009f, 0.918790996f}, {-0.382683009f, 0.923879981f}, {-0.370557010f, 0.928810000f}, {-0.358368009f, 0.933579981f}, {-0.346116990f, 0.938190997f}, {-0.333806992f, 0.942641020f}, {-0.321438998f, 0.946929991f}, {-0.309017003f, 0.951057017f}, {-0.296541989f, 0.955020010f}, {-0.284015000f, 0.958819985f}, {-0.271439999f, 0.962454975f}, {-0.258819014f, 0.965925992f}, {-0.246152997f, 0.969231009f}, {-0.233445004f, 0.972370028f}, {-0.220697001f, 0.975341976f}, {-0.207911998f, 0.978147984f}, {-0.195089996f, 0.980785012f}, {-0.182236001f, 0.983255029f}, {-0.169349998f, 0.985556006f}, {-0.156434000f, 0.987688005f}, {-0.143492997f, 0.989651024f}, {-0.130526006f, 0.991445005f}, {-0.117536999f, 0.993067980f}, {-0.104528002f, 0.994521976f}, {-0.091502003f, 0.995805025f}, {-0.078459002f, 0.996917009f}, {-0.065403000f, 0.997859001f}, {-0.052336000f, 0.998629987f}, {-0.039260000f, 0.999229014f}, {-0.026177000f, 0.999656975f}, {-0.013090000f, 0.999913990f}, {-0.000000000f, 1.000000000f}, {0.013090000f, 0.999913990f}, {0.026177000f, 0.999656975f}, {0.039260000f, 0.999229014f}, {0.052336000f, 0.998629987f}, {0.065403000f, 0.997859001f}, {0.078459002f, 0.996917009f}, {0.091502003f, 0.995805025f}, {0.104528002f, 0.994521976f}, {0.117536999f, 0.993067980f}, {0.130526006f, 0.991445005f}, {0.143492997f, 0.989651024f}, {0.156434000f, 0.987688005f}, {0.169349998f, 0.985556006f}, {0.182236001f, 0.983255029f}, {0.195089996f, 0.980785012f}, {0.207911998f, 0.978147984f}, {0.220697001f, 0.975341976f}, {0.233445004f, 0.972370028f}, {0.246152997f, 0.969231009f}, {0.258819014f, 0.965925992f}, {0.271439999f, 0.962454975f}, {0.284015000f, 0.958819985f}, {0.296541989f, 0.955020010f}, {0.309017003f, 0.951057017f}, {0.321438998f, 0.946929991f}, {0.333806992f, 0.942641020f}, {0.346116990f, 0.938190997f}, {0.358368009f, 0.933579981f}, {0.370557010f, 0.928810000f}, {0.382683009f, 0.923879981f}, {0.394744009f, 0.918790996f}, {0.406737000f, 0.913545012f}, {0.418660015f, 0.908142984f}, {0.430510998f, 0.902585030f}, {0.442288995f, 0.896872997f}, {0.453990012f, 0.891007006f}, {0.465615004f, 0.884988010f}, {0.477158993f, 0.878817022f}, {0.488620996f, 0.872496009f}, {0.500000000f, 0.866024971f}, {0.511292994f, 0.859405994f}, {0.522499025f, 0.852639973f}, {0.533614993f, 0.845727980f}, {0.544638991f, 0.838671029f}, {0.555570006f, 0.831470013f}, {0.566406012f, 0.824126005f}, {0.577144980f, 0.816641986f}, {0.587785006f, 0.809017003f}, {0.598325014f, 0.801253974f}, {0.608761013f, 0.793353021f}, {0.619094014f, 0.785317004f}, {0.629320025f, 0.777145982f}, {0.639438987f, 0.768841982f}, {0.649447978f, 0.760406017f}, {0.659345984f, 0.751839995f}, {0.669130981f, 0.743144989f}, {0.678801000f, 0.734322011f}, {0.688355029f, 0.725373983f}, {0.697790027f, 0.716301978f}, {0.707107008f, 0.707107008f}, {0.716301978f, 0.697790027f}, {0.725373983f, 0.688355029f}, {0.734322011f, 0.678801000f}, {0.743144989f, 0.669130981f}, {0.751839995f, 0.659345984f}, {0.760406017f, 0.649447978f}, {0.768841982f, 0.639438987f}, {0.777145982f, 0.629320025f}, {0.785317004f, 0.619094014f}, {0.793353021f, 0.608761013f}, {0.801253974f, 0.598325014f}, {0.809017003f, 0.587785006f}, {0.816641986f, 0.577144980f}, {0.824126005f, 0.566406012f}, {0.831470013f, 0.555570006f}, {0.838671029f, 0.544638991f}, {0.845727980f, 0.533614993f}, {0.852639973f, 0.522499025f}, {0.859405994f, 0.511292994f}, {0.866024971f, 0.500000000f}, {0.872496009f, 0.488620996f}, {0.878817022f, 0.477158993f}, {0.884988010f, 0.465615004f}, {0.891007006f, 0.453990012f}, {0.896872997f, 0.442288995f}, {0.902585030f, 0.430510998f}, {0.908142984f, 0.418660015f}, {0.913545012f, 0.406737000f}, {0.918790996f, 0.394744009f}, {0.923879981f, 0.382683009f}, {0.928810000f, 0.370557010f}, {0.933579981f, 0.358368009f}, {0.938190997f, 0.346116990f}, {0.942641020f, 0.333806992f}, {0.946929991f, 0.321438998f}, {0.951057017f, 0.309017003f}, {0.955020010f, 0.296541989f}, {0.958819985f, 0.284015000f}, {0.962454975f, 0.271439999f}, {0.965925992f, 0.258819014f}, {0.969231009f, 0.246152997f}, {0.972370028f, 0.233445004f}, {0.975341976f, 0.220697001f}, {0.978147984f, 0.207911998f}, {0.980785012f, 0.195089996f}, {0.983255029f, 0.182236001f}, {0.985556006f, 0.169349998f}, {0.987688005f, 0.156434000f}, {0.989651024f, 0.143492997f}, {0.991445005f, 0.130526006f}, {0.993067980f, 0.117536999f}, {0.994521976f, 0.104528002f}, {0.995805025f, 0.091502003f}, {0.996917009f, 0.078459002f}, {0.997859001f, 0.065403000f}, {0.998629987f, 0.052336000f}, {0.999229014f, 0.039260000f}, {0.999656975f, 0.026177000f}, {0.999913990f, 0.013090000f}, };
#ifndef FFT_BITREV480
#define FFT_BITREV480
static const opus_int16 fft_bitrev480[480] = {
@@ -57,7 +57,7 @@ static const opus_int16 fft_bitrev60[60] = {
#define FFT_STATE48000_960_0
static const kiss_fft_state fft_state48000_960_0 = {
480, /* nfft */
-0.002083, /* scale */
+0.002083000f, /* scale */
-1, /* shift */
{4, 120, 4, 30, 2, 15, 3, 5, 5, 1, 0, 0, 0, 0, 0, 0, }, /* factors */
fft_bitrev480, /* bitrev */
@@ -69,7 +69,7 @@ fft_twiddles48000_960, /* bitrev */
#define FFT_STATE48000_960_1
static const kiss_fft_state fft_state48000_960_1 = {
240, /* nfft */
-0.004167, /* scale */
+0.004167000f, /* scale */
1, /* shift */
{4, 60, 4, 15, 3, 5, 5, 1, 0, 0, 0, 0, 0, 0, 0, 0, }, /* factors */
fft_bitrev240, /* bitrev */
@@ -81,7 +81,7 @@ fft_twiddles48000_960, /* bitrev */
#define FFT_STATE48000_960_2
static const kiss_fft_state fft_state48000_960_2 = {
120, /* nfft */
-0.008333, /* scale */
+0.008333000f, /* scale */
2, /* shift */
{4, 30, 2, 15, 3, 5, 5, 1, 0, 0, 0, 0, 0, 0, 0, 0, }, /* factors */
fft_bitrev120, /* bitrev */
@@ -93,7 +93,7 @@ fft_twiddles48000_960, /* bitrev */
#define FFT_STATE48000_960_3
static const kiss_fft_state fft_state48000_960_3 = {
60, /* nfft */
-0.016667, /* scale */
+0.016666999f, /* scale */
3, /* shift */
{4, 15, 3, 5, 5, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, }, /* factors */
fft_bitrev60, /* bitrev */
@@ -106,7 +106,7 @@ fft_twiddles48000_960, /* bitrev */
#ifndef MDCT_TWIDDLES960
#define MDCT_TWIDDLES960
static const opus_val16 mdct_twiddles960[481] = {
-1.000000, 0.999995, 0.999979, 0.999952, 0.999914, 0.999866, 0.999807, 0.999738, 0.999657, 0.999566, 0.999465, 0.999352, 0.999229, 0.999095, 0.998951, 0.998795, 0.998630, 0.998453, 0.998266, 0.998068, 0.997859, 0.997640, 0.997409, 0.997169, 0.996917, 0.996655, 0.996382, 0.996099, 0.995805, 0.995500, 0.995185, 0.994859, 0.994522, 0.994174, 0.993816, 0.993448, 0.993068, 0.992679, 0.992278, 0.991867, 0.991445, 0.991012, 0.990569, 0.990116, 0.989651, 0.989177, 0.988691, 0.988195, 0.987688, 0.987171, 0.986643, 0.986105, 0.985556, 0.984997, 0.984427, 0.983846, 0.983255, 0.982653, 0.982041, 0.981418, 0.980785, 0.980142, 0.979487, 0.978823, 0.978148, 0.977462, 0.976766, 0.976059, 0.975342, 0.974615, 0.973877, 0.973129, 0.972370, 0.971601, 0.970821, 0.970031, 0.969231, 0.968420, 0.967599, 0.966768, 0.965926, 0.965074, 0.964211, 0.963338, 0.962455, 0.961562, 0.960658, 0.959744, 0.958820, 0.957885, 0.956940, 0.955985, 0.955020, 0.954044, 0.953059, 0.952063, 0.951057, 0.950040, 0.949014, 0.947977, 0.946930, 0.945873, 0.944806, 0.943729, 0.942641, 0.941544, 0.940437, 0.939319, 0.938191, 0.937054, 0.935906, 0.934748, 0.933580, 0.932403, 0.931215, 0.930017, 0.928810, 0.927592, 0.926364, 0.925127, 0.923880, 0.922622, 0.921355, 0.920078, 0.918791, 0.917494, 0.916188, 0.914872, 0.913545, 0.912210, 0.910864, 0.909508, 0.908143, 0.906768, 0.905384, 0.903989, 0.902585, 0.901172, 0.899748, 0.898315, 0.896873, 0.895421, 0.893959, 0.892487, 0.891007, 0.889516, 0.888016, 0.886507, 0.884988, 0.883459, 0.881921, 0.880374, 0.878817, 0.877251, 0.875675, 0.874090, 0.872496, 0.870892, 0.869279, 0.867657, 0.866025, 0.864385, 0.862734, 0.861075, 0.859406, 0.857729, 0.856042, 0.854345, 0.852640, 0.850926, 0.849202, 0.847470, 0.845728, 0.843977, 0.842217, 0.840448, 0.838671, 0.836884, 0.835088, 0.833283, 0.831470, 0.829647, 0.827816, 0.825975, 0.824126, 0.822268, 0.820401, 0.818526, 0.816642, 0.814748, 0.812847, 0.810936, 0.809017, 0.807089, 0.805153, 0.803208, 0.801254, 0.799291, 0.797321, 0.795341, 0.793353, 0.791357, 0.789352, 0.787339, 0.785317, 0.783287, 0.781248, 0.779201, 0.777146, 0.775082, 0.773010, 0.770930, 0.768842, 0.766745, 0.764640, 0.762527, 0.760406, 0.758277, 0.756139, 0.753994, 0.751840, 0.749678, 0.747508, 0.745331, 0.743145, 0.740951, 0.738750, 0.736540, 0.734322, 0.732097, 0.729864, 0.727623, 0.725374, 0.723118, 0.720854, 0.718582, 0.716302, 0.714015, 0.711720, 0.709417, 0.707107, 0.704789, 0.702464, 0.700131, 0.697790, 0.695443, 0.693087, 0.690725, 0.688355, 0.685977, 0.683592, 0.681200, 0.678801, 0.676394, 0.673980, 0.671559, 0.669131, 0.666695, 0.664252, 0.661803, 0.659346, 0.656882, 0.654411, 0.651933, 0.649448, 0.646956, 0.644457, 0.641952, 0.639439, 0.636920, 0.634393, 0.631860, 0.629320, 0.626774, 0.624221, 0.621661, 0.619094, 0.616521, 0.613941, 0.611354, 0.608761, 0.606162, 0.603556, 0.600944, 0.598325, 0.595699, 0.593068, 0.590430, 0.587785, 0.585135, 0.582478, 0.579815, 0.577145, 0.574470, 0.571788, 0.569100, 0.566406, 0.563706, 0.561000, 0.558288, 0.555570, 0.552846, 0.550116, 0.547381, 0.544639, 0.541892, 0.539138, 0.536379, 0.533615, 0.530844, 0.528068, 0.525286, 0.522499, 0.519706, 0.516907, 0.514103, 0.511293, 0.508478, 0.505657, 0.502831, 0.500000, 0.497163, 0.494321, 0.491474, 0.488621, 0.485763, 0.482900, 0.480032, 0.477159, 0.474280, 0.471397, 0.468508, 0.465615, 0.462716, 0.459812, 0.456904, 0.453990, 0.451072, 0.448149, 0.445221, 0.442289, 0.439351, 0.436409, 0.433463, 0.430511, 0.427555, 0.424595, 0.421629, 0.418660, 0.415686, 0.412707, 0.409724, 0.406737, 0.403745, 0.400749, 0.397748, 0.394744, 0.391735, 0.388722, 0.385705, 0.382683, 0.379658, 0.376628, 0.373595, 0.370557, 0.367516, 0.364471, 0.361421, 0.358368, 0.355311, 0.352250, 0.349185, 0.346117, 0.343045, 0.339969, 0.336890, 0.333807, 0.330720, 0.327630, 0.324537, 0.321439, 0.318339, 0.315235, 0.312128, 0.309017, 0.305903, 0.302786, 0.299665, 0.296542, 0.293415, 0.290285, 0.287152, 0.284015, 0.280876, 0.277734, 0.274589, 0.271440, 0.268289, 0.265135, 0.261979, 0.258819, 0.255657, 0.252492, 0.249324, 0.246153, 0.242980, 0.239804, 0.236626, 0.233445, 0.230262, 0.227076, 0.223888, 0.220697, 0.217504, 0.214309, 0.211112, 0.207912, 0.204710, 0.201505, 0.198299, 0.195090, 0.191880, 0.188667, 0.185452, 0.182236, 0.179017, 0.175796, 0.172574, 0.169350, 0.166123, 0.162895, 0.159666, 0.156434, 0.153201, 0.149967, 0.146730, 0.143493, 0.140253, 0.137012, 0.133770, 0.130526, 0.127281, 0.124034, 0.120787, 0.117537, 0.114287, 0.111035, 0.107782, 0.104528, 0.101273, 0.098017, 0.094760, 0.091502, 0.088242, 0.084982, 0.081721, 0.078459, 0.075196, 0.071933, 0.068668, 0.065403, 0.062137, 0.058871, 0.055604, 0.052336, 0.049068, 0.045799, 0.042530, 0.039260, 0.035990, 0.032719, 0.029448, 0.026177, 0.022905, 0.019634, 0.016362, 0.013090, 0.009817, 0.006545, 0.003272, 0.000000, };
+1.000000000f, 0.999994993f, 0.999979019f, 0.999952018f, 0.999913990f, 0.999866009f, 0.999807000f, 0.999737978f, 0.999656975f, 0.999566019f, 0.999464989f, 0.999351978f, 0.999229014f, 0.999095023f, 0.998951018f, 0.998794973f, 0.998629987f, 0.998453021f, 0.998265982f, 0.998067975f, 0.997859001f, 0.997640014f, 0.997408986f, 0.997169018f, 0.996917009f, 0.996654987f, 0.996381998f, 0.996098995f, 0.995805025f, 0.995500028f, 0.995185018f, 0.994858980f, 0.994521976f, 0.994174004f, 0.993816018f, 0.993448019f, 0.993067980f, 0.992679000f, 0.992277980f, 0.991867006f, 0.991445005f, 0.991011977f, 0.990568995f, 0.990116000f, 0.989651024f, 0.989176989f, 0.988690972f, 0.988195002f, 0.987688005f, 0.987170994f, 0.986643016f, 0.986105025f, 0.985556006f, 0.984996974f, 0.984426975f, 0.983846009f, 0.983255029f, 0.982653022f, 0.982041001f, 0.981418014f, 0.980785012f, 0.980141997f, 0.979487002f, 0.978823006f, 0.978147984f, 0.977461994f, 0.976765990f, 0.976059020f, 0.975341976f, 0.974614978f, 0.973877013f, 0.973128974f, 0.972370028f, 0.971601009f, 0.970821023f, 0.970031023f, 0.969231009f, 0.968420029f, 0.967598975f, 0.966768026f, 0.965925992f, 0.965074003f, 0.964210987f, 0.963338017f, 0.962454975f, 0.961561978f, 0.960658014f, 0.959743977f, 0.958819985f, 0.957885027f, 0.956939995f, 0.955985010f, 0.955020010f, 0.954043984f, 0.953059018f, 0.952063024f, 0.951057017f, 0.950039983f, 0.949014008f, 0.947977006f, 0.946929991f, 0.945873022f, 0.944805980f, 0.943728983f, 0.942641020f, 0.941543996f, 0.940437019f, 0.939319015f, 0.938190997f, 0.937053978f, 0.935905993f, 0.934747994f, 0.933579981f, 0.932403028f, 0.931214988f, 0.930016994f, 0.928810000f, 0.927591980f, 0.926364005f, 0.925127029f, 0.923879981f, 0.922622025f, 0.921355009f, 0.920077980f, 0.918790996f, 0.917493999f, 0.916188002f, 0.914871991f, 0.913545012f, 0.912209988f, 0.910863996f, 0.909507990f, 0.908142984f, 0.906768024f, 0.905384004f, 0.903989017f, 0.902585030f, 0.901171982f, 0.899748027f, 0.898315012f, 0.896872997f, 0.895421028f, 0.893958986f, 0.892486989f, 0.891007006f, 0.889515996f, 0.888015985f, 0.886506975f, 0.884988010f, 0.883458972f, 0.881920993f, 0.880374014f, 0.878817022f, 0.877251029f, 0.875675023f, 0.874090016f, 0.872496009f, 0.870891988f, 0.869279027f, 0.867657006f, 0.866024971f, 0.864385009f, 0.862734020f, 0.861074984f, 0.859405994f, 0.857729018f, 0.856042027f, 0.854345024f, 0.852639973f, 0.850925982f, 0.849201977f, 0.847469985f, 0.845727980f, 0.843976974f, 0.842217028f, 0.840448022f, 0.838671029f, 0.836884022f, 0.835088015f, 0.833283007f, 0.831470013f, 0.829647005f, 0.827816010f, 0.825975001f, 0.824126005f, 0.822268009f, 0.820401013f, 0.818526030f, 0.816641986f, 0.814747989f, 0.812847018f, 0.810935974f, 0.809017003f, 0.807088971f, 0.805153012f, 0.803207994f, 0.801253974f, 0.799291015f, 0.797321022f, 0.795341015f, 0.793353021f, 0.791356981f, 0.789352000f, 0.787338972f, 0.785317004f, 0.783286989f, 0.781247973f, 0.779200971f, 0.777145982f, 0.775081992f, 0.773010015f, 0.770929992f, 0.768841982f, 0.766744971f, 0.764639974f, 0.762526989f, 0.760406017f, 0.758276999f, 0.756138980f, 0.753993988f, 0.751839995f, 0.749678016f, 0.747507989f, 0.745330989f, 0.743144989f, 0.740951002f, 0.738749981f, 0.736540020f, 0.734322011f, 0.732097030f, 0.729864001f, 0.727622986f, 0.725373983f, 0.723118007f, 0.720853984f, 0.718581975f, 0.716301978f, 0.714015007f, 0.711719990f, 0.709416986f, 0.707107008f, 0.704788983f, 0.702463984f, 0.700130999f, 0.697790027f, 0.695442975f, 0.693086982f, 0.690725029f, 0.688355029f, 0.685976982f, 0.683592021f, 0.681200027f, 0.678801000f, 0.676393986f, 0.673979998f, 0.671558976f, 0.669130981f, 0.666694999f, 0.664251983f, 0.661803007f, 0.659345984f, 0.656881988f, 0.654411018f, 0.651933014f, 0.649447978f, 0.646956027f, 0.644456983f, 0.641951978f, 0.639438987f, 0.636919975f, 0.634392977f, 0.631860018f, 0.629320025f, 0.626774013f, 0.624221027f, 0.621661007f, 0.619094014f, 0.616521001f, 0.613941014f, 0.611353993f, 0.608761013f, 0.606162012f, 0.603555977f, 0.600943983f, 0.598325014f, 0.595699012f, 0.593068004f, 0.590430021f, 0.587785006f, 0.585134983f, 0.582477987f, 0.579814970f, 0.577144980f, 0.574469984f, 0.571788013f, 0.569100022f, 0.566406012f, 0.563705981f, 0.560999990f, 0.558287978f, 0.555570006f, 0.552846014f, 0.550116003f, 0.547380984f, 0.544638991f, 0.541891992f, 0.539138019f, 0.536378980f, 0.533614993f, 0.530843973f, 0.528068006f, 0.525286019f, 0.522499025f, 0.519706011f, 0.516906977f, 0.514102995f, 0.511292994f, 0.508477986f, 0.505657017f, 0.502830982f, 0.500000000f, 0.497162998f, 0.494320989f, 0.491474003f, 0.488620996f, 0.485763013f, 0.482899994f, 0.480031997f, 0.477158993f, 0.474280000f, 0.471397012f, 0.468508005f, 0.465615004f, 0.462716013f, 0.459811985f, 0.456903994f, 0.453990012f, 0.451072007f, 0.448148996f, 0.445221007f, 0.442288995f, 0.439350992f, 0.436408997f, 0.433463007f, 0.430510998f, 0.427554995f, 0.424594998f, 0.421629012f, 0.418660015f, 0.415686011f, 0.412707001f, 0.409723997f, 0.406737000f, 0.403744996f, 0.400748998f, 0.397747993f, 0.394744009f, 0.391734987f, 0.388722003f, 0.385704994f, 0.382683009f, 0.379658014f, 0.376628011f, 0.373594999f, 0.370557010f, 0.367516011f, 0.364470989f, 0.361420989f, 0.358368009f, 0.355311006f, 0.352250010f, 0.349184990f, 0.346116990f, 0.343044996f, 0.339969009f, 0.336890012f, 0.333806992f, 0.330720007f, 0.327630013f, 0.324537009f, 0.321438998f, 0.318338990f, 0.315234989f, 0.312128007f, 0.309017003f, 0.305902988f, 0.302785993f, 0.299665004f, 0.296541989f, 0.293415010f, 0.290284991f, 0.287151992f, 0.284015000f, 0.280876011f, 0.277734011f, 0.274589002f, 0.271439999f, 0.268289000f, 0.265134990f, 0.261979014f, 0.258819014f, 0.255656987f, 0.252492011f, 0.249323994f, 0.246152997f, 0.242980003f, 0.239804000f, 0.236625999f, 0.233445004f, 0.230261996f, 0.227075994f, 0.223887995f, 0.220697001f, 0.217503995f, 0.214309007f, 0.211111993f, 0.207911998f, 0.204710007f, 0.201505005f, 0.198299006f, 0.195089996f, 0.191880003f, 0.188666999f, 0.185451999f, 0.182236001f, 0.179017007f, 0.175796002f, 0.172573999f, 0.169349998f, 0.166123003f, 0.162894994f, 0.159666002f, 0.156434000f, 0.153200999f, 0.149967000f, 0.146730006f, 0.143492997f, 0.140253007f, 0.137012005f, 0.133770004f, 0.130526006f, 0.127280995f, 0.124034002f, 0.120787002f, 0.117536999f, 0.114286996f, 0.111034997f, 0.107781999f, 0.104528002f, 0.101273000f, 0.098017000f, 0.094760001f, 0.091502003f, 0.088242002f, 0.084982000f, 0.081721000f, 0.078459002f, 0.075195998f, 0.071933001f, 0.068668000f, 0.065403000f, 0.062137000f, 0.058871001f, 0.055604000f, 0.052336000f, 0.049068000f, 0.045798998f, 0.042530000f, 0.039260000f, 0.035990000f, 0.032719001f, 0.029448001f, 0.026177000f, 0.022905000f, 0.019633999f, 0.016362000f, 0.013090000f, 0.009817000f, 0.006545000f, 0.003272000f, 0.000000000f, };
#endif
static const CELTMode mode48000_960_120 = {
@@ -114,7 +114,7 @@ static const CELTMode mode48000_960_120 = {
120, /* overlap */
21, /* nbEBands */
21, /* effEBands */
-{0.850006, 0.000000, 1.000000, 1.000000, }, /* preemph */
+{0.850005984f, 0.000000000f, 1.000000000f, 1.000000000f, }, /* preemph */
eband5ms, /* eBands */
11, /* nbAllocVectors */
band_allocation, /* allocVectors */
diff --git a/libcelt/vq.c b/libcelt/vq.c
index 4702811cf5c34420b07745043d347281da54c1d4..acf6e6446a24dedf680569452feead6ab402a43c 100644
--- a/libcelt/vq.c
+++ b/libcelt/vq.c
@@ -38,10 +38,6 @@
#include "bands.h"
#include "rate.h"
-#ifndef M_PI
-#define M_PI 3.141592653
-#endif
-
static void exp_rotation1(celt_norm *X, int len, int stride, opus_val16 c, opus_val16 s)
{
int i;
@@ -333,7 +329,6 @@ unsigned alg_quant(celt_norm *X, int N, int K, int spread, int B,
return collapse_mask;
}
-
/** Decode pulse vector and combine the result with the pitch vector to produce
the final normalised signal in the current band. */
unsigned alg_unquant(celt_norm *X, int N, int K, int spread, int B,
diff --git a/silk/float/silk_LTP_scale_ctrl_FLP.c b/silk/float/silk_LTP_scale_ctrl_FLP.c
index 2803f590054926e6f58c9efcf874300fbf80a6c2..c3aaf57c568a43b5c801aedb2d82111b1611163a 100644
--- a/silk/float/silk_LTP_scale_ctrl_FLP.c
+++ b/silk/float/silk_LTP_scale_ctrl_FLP.c
@@ -36,7 +36,7 @@ void silk_LTP_scale_ctrl_FLP(
/* 1st order high-pass filter */
//g_HP(n) = g(n) - 0.5 * g(n-1) + 0.5 * g_HP(n-1);
- psEnc->HPLTPredCodGain = SKP_max_float( psEncCtrl->LTPredCodGain - 0.5 * psEnc->prevLTPredCodGain, 0.0f )
+ psEnc->HPLTPredCodGain = SKP_max_float( psEncCtrl->LTPredCodGain - 0.5f * psEnc->prevLTPredCodGain, 0.0f )
+ 0.5f * psEnc->HPLTPredCodGain;
psEnc->prevLTPredCodGain = psEncCtrl->LTPredCodGain;