diff options
author | Mark Harris <mark.hsj@gmail.com> | 2019-04-07 23:25:27 -0700 |
---|---|---|
committer | Mark Harris <mark.hsj@gmail.com> | 2019-04-08 21:39:15 -0700 |
commit | 196511de23161330c74d123a2076892652c9dc95 (patch) | |
tree | 764262205bbd9d8b843b77bfe79f67596bfeccae /celt | |
parent | f9d3d432d135253357ba457ecd0e4f68f12a4584 (diff) | |
download | opus-196511de23161330c74d123a2076892652c9dc95.tar.gz |
Fix build errors using Makefile.mips
Broken by earlier ARM optimizations.
Diffstat (limited to 'celt')
-rw-r--r-- | celt/mips/celt_mipsr1.h | 1 | ||||
-rw-r--r-- | celt/mips/vq_mipsr1.h | 8 | ||||
-rw-r--r-- | celt/vq.c | 4 | ||||
-rw-r--r-- | celt/vq.h | 4 |
4 files changed, 6 insertions, 11 deletions
diff --git a/celt/mips/celt_mipsr1.h b/celt/mips/celt_mipsr1.h index e85661a6..c332fe04 100644 --- a/celt/mips/celt_mipsr1.h +++ b/celt/mips/celt_mipsr1.h @@ -53,6 +53,7 @@ #include "celt_lpc.h" #include "vq.h" +#define OVERRIDE_COMB_FILTER_CONST #define OVERRIDE_comb_filter void comb_filter(opus_val32 *y, opus_val32 *x, int T0, int T1, int N, opus_val16 g0, opus_val16 g1, int tapset0, int tapset1, diff --git a/celt/mips/vq_mipsr1.h b/celt/mips/vq_mipsr1.h index fd18eab7..f26a33e7 100644 --- a/celt/mips/vq_mipsr1.h +++ b/celt/mips/vq_mipsr1.h @@ -36,8 +36,6 @@ #include "mathops.h" #include "arch.h" -static void renormalise_vector_mips(celt_norm *X, int N, opus_val16 gain, int arch); - #define OVERRIDE_vq_exp_rotation1 static void exp_rotation1(celt_norm *X, int len, int stride, opus_val16 c, opus_val16 s) { @@ -66,11 +64,7 @@ static void exp_rotation1(celt_norm *X, int len, int stride, opus_val16 c, opus_ } #define OVERRIDE_renormalise_vector - -#define renormalise_vector(X, N, gain, arch) \ - (renormalise_vector_mips(X, N, gain, arch)) - -void renormalise_vector_mips(celt_norm *X, int N, opus_val16 gain, int arch) +void renormalise_vector(celt_norm *X, int N, opus_val16 gain, int arch) { int i; #ifdef FIXED_POINT @@ -39,6 +39,10 @@ #include "rate.h" #include "pitch.h" +#if defined(MIPSr1_ASM) +#include "mips/vq_mipsr1.h" +#endif + #ifndef OVERRIDE_vq_exp_rotation1 static void exp_rotation1(celt_norm *X, int len, int stride, opus_val16 c, opus_val16 s) { @@ -41,10 +41,6 @@ #include "x86/vq_sse.h" #endif -#if defined(MIPSr1_ASM) -#include "mips/vq_mipsr1.h" -#endif - void exp_rotation(celt_norm *X, int len, int dir, int stride, int K, int spread); opus_val16 op_pvq_search_c(celt_norm *X, int *iy, int K, int N, int arch); |