Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.xiph.org/xiph/opus.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Klingbeil <klingm@amazon.com>2023-07-01 05:41:03 +0300
committerMichael Klingbeil <klingm@amazon.com>2023-07-01 05:54:09 +0300
commit17bb81934ba2bf3123500c10b8aac6a8f2dfc11a (patch)
tree1530d95a6337146d1040cf0e2071775f0acb4f64
parent105e1d83fad6393b00edb7eb676be483eb4ee2d7 (diff)
add undefs in mathops.h and remove OPUS_INLINE in vec_neon.h
-rw-r--r--celt/mathops.h6
-rw-r--r--dnn/vec_neon.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/celt/mathops.h b/celt/mathops.h
index 478ac918..e2eece29 100644
--- a/celt/mathops.h
+++ b/celt/mathops.h
@@ -230,6 +230,12 @@ static OPUS_INLINE opus_val32 celt_exp2_frac(opus_val16 x)
frac = SHL16(x, 4);
return ADD16(D0, MULT16_16_Q15(frac, ADD16(D1, MULT16_16_Q15(frac, ADD16(D2 , MULT16_16_Q15(D3,frac))))));
}
+
+#undef D0
+#undef D1
+#undef D2
+#undef D3
+
/** Base-2 exponential approximation (2^x). (Q10 input, Q16 output) */
static OPUS_INLINE opus_val32 celt_exp2(opus_val16 x)
{
diff --git a/dnn/vec_neon.h b/dnn/vec_neon.h
index aeb216e1..61d63d4c 100644
--- a/dnn/vec_neon.h
+++ b/dnn/vec_neon.h
@@ -45,7 +45,7 @@ typedef float qweight;
#ifndef LPCNET_TEST
-static inline OPUS_INLINE float32x4_t exp4_approx(float32x4_t x) {
+static inline float32x4_t exp4_approx(float32x4_t x) {
int32x4_t i;
float32x4_t xf;