Index: celt/arch.h |
diff --git a/celt/arch.h b/celt/arch.h |
index 03cda40f6948965f3666df20072e84477ae6de7b..f9c98567aa848944eae08fc25423c9d65db58c23 100644 |
--- a/celt/arch.h |
+++ b/celt/arch.h |
@@ -100,6 +100,7 @@ typedef opus_val32 celt_ener; |
#define DB_SHIFT 10 |
#define EPSILON 1 |
+#define VERY_SMALL 0 |
#define VERY_LARGE16 ((opus_val16)32767) |
#define Q15_ONE ((opus_val16)32767) |
@@ -112,10 +113,10 @@ typedef opus_val32 celt_ener; |
#include "fixed_generic.h" |
-#ifdef ARM5E_ASM |
-#include "fixed_arm5e.h" |
-#elif defined (ARM4_ASM) |
-#include "fixed_arm4.h" |
+#ifdef ARMv5E_ASM |
+#include "arm/fixed_armv5e.h" |
+#elif defined (ARMv4_ASM) |
+#include "arm/fixed_armv4.h" |
#elif defined (BFIN_ASM) |
#include "fixed_bfin.h" |
#elif defined (TI_C5X_ASM) |
@@ -140,6 +141,7 @@ typedef float celt_ener; |
#define NORM_SCALING 1.f |
#define EPSILON 1e-15f |
+#define VERY_SMALL 1e-30f |
#define VERY_LARGE16 1e15f |
#define Q15_ONE ((opus_val16)1.f) |
@@ -161,6 +163,7 @@ typedef float celt_ener; |
#define SHR(a,shift) (a) |
#define SHL(a,shift) (a) |
#define SATURATE(x,a) (x) |
+#define SATURATE16(x) (x) |
#define ROUND16(a,shift) (a) |
#define HALF16(x) (.5f*(x)) |
@@ -182,6 +185,7 @@ typedef float celt_ener; |
#define MAC16_32_Q15(c,a,b) ((c)+(a)*(b)) |
#define MULT16_16_Q11_32(a,b) ((a)*(b)) |
+#define MULT16_16_Q11(a,b) ((a)*(b)) |
#define MULT16_16_Q13(a,b) ((a)*(b)) |
#define MULT16_16_Q14(a,b) ((a)*(b)) |
#define MULT16_16_Q15(a,b) ((a)*(b)) |