diff options
Diffstat (limited to 'libcelt/arch.h')
| -rw-r--r-- | libcelt/arch.h | 49 |
1 files changed, 24 insertions, 25 deletions
diff --git a/libcelt/arch.h b/libcelt/arch.h index 3d803b0..084b298 100644 --- a/libcelt/arch.h +++ b/libcelt/arch.h @@ -71,14 +71,13 @@ #ifdef FIXED_POINT -typedef celt_int16 celt_word16_t; -typedef celt_int32 celt_word32_t; +typedef celt_int16 celt_word16; +typedef celt_int32 celt_word32; -typedef celt_word32_t celt_sig_t; -typedef celt_word16_t celt_norm_t; -typedef celt_word32_t celt_ener_t; -typedef celt_word16_t celt_pgain_t; -typedef celt_word32_t celt_mask_t; +typedef celt_word32 celt_sig; +typedef celt_word16 celt_norm; +typedef celt_word32 celt_ener; +typedef celt_word32 celt_mask; #define Q15ONE 32767 #define Q30ONE 1073741823 @@ -102,9 +101,9 @@ typedef celt_word32_t celt_mask_t; #define EPSILON 1 #define VERY_SMALL 0 -#define VERY_LARGE32 ((celt_word32_t)2147483647) -#define VERY_LARGE16 ((celt_word16_t)32767) -#define Q15_ONE ((celt_word16_t)32767) +#define VERY_LARGE32 ((celt_word32)2147483647) +#define VERY_LARGE16 ((celt_word16)32767) +#define Q15_ONE ((celt_word16)32767) #define Q15_ONE_1 (1.f/32768.f) #define SCALEIN(a) (a) @@ -133,14 +132,14 @@ typedef celt_word32_t celt_mask_t; #else /* FIXED_POINT */ -typedef float celt_word16_t; -typedef float celt_word32_t; +typedef float celt_word16; +typedef float celt_word32; -typedef float celt_sig_t; -typedef float celt_norm_t; -typedef float celt_ener_t; -typedef float celt_pgain_t; -typedef float celt_mask_t; +typedef float celt_sig; +typedef float celt_norm; +typedef float celt_ener; +typedef float celt_pgain; +typedef float celt_mask; #define Q15ONE 1.0f #define Q30ONE 1.0f @@ -159,8 +158,8 @@ typedef float celt_mask_t; #define VERY_SMALL 1e-15f #define VERY_LARGE32 1e15f #define VERY_LARGE16 1e15f -#define Q15_ONE ((celt_word16_t)1.f) -#define Q15_ONE_1 ((celt_word16_t)1.f) +#define Q15_ONE ((celt_word16)1.f) +#define Q15_ONE_1 ((celt_word16)1.f) #define QCONST16(x,bits) (x) #define QCONST32(x,bits) (x) @@ -192,8 +191,8 @@ typedef float celt_mask_t; #define ADD32(a,b) ((a)+(b)) #define SUB32(a,b) ((a)-(b)) #define MULT16_16_16(a,b) ((a)*(b)) -#define MULT16_16(a,b) ((celt_word32_t)(a)*(celt_word32_t)(b)) -#define MAC16_16(c,a,b) ((c)+(celt_word32_t)(a)*(celt_word32_t)(b)) +#define MULT16_16(a,b) ((celt_word32)(a)*(celt_word32)(b)) +#define MAC16_16(c,a,b) ((c)+(celt_word32)(a)*(celt_word32)(b)) #define MULT16_32_Q11(a,b) ((a)*(b)) #define MULT16_32_Q13(a,b) ((a)*(b)) @@ -218,10 +217,10 @@ typedef float celt_mask_t; #define MULT16_16_P13(a,b) ((a)*(b)) #define MULT16_16_P14(a,b) ((a)*(b)) -#define DIV32_16(a,b) (((celt_word32_t)(a))/(celt_word16_t)(b)) -#define PDIV32_16(a,b) (((celt_word32_t)(a))/(celt_word16_t)(b)) -#define DIV32(a,b) (((celt_word32_t)(a))/(celt_word32_t)(b)) -#define PDIV32(a,b) (((celt_word32_t)(a))/(celt_word32_t)(b)) +#define DIV32_16(a,b) (((celt_word32)(a))/(celt_word16)(b)) +#define PDIV32_16(a,b) (((celt_word32)(a))/(celt_word16)(b)) +#define DIV32(a,b) (((celt_word32)(a))/(celt_word32)(b)) +#define PDIV32(a,b) (((celt_word32)(a))/(celt_word32)(b)) #define SCALEIN(a) ((a)*CELT_SIG_SCALE) #define SCALEOUT(a) ((a)*(1/CELT_SIG_SCALE)) |