diff options
| author | Mark Harris <mark.hsj@gmail.com> | 2019-04-08 09:25:27 +0300 |
|---|---|---|
| committer | Mark Harris <mark.hsj@gmail.com> | 2019-04-09 07:39:15 +0300 |
| commit | 196511de23161330c74d123a2076892652c9dc95 (patch) | |
| tree | 764262205bbd9d8b843b77bfe79f67596bfeccae /silk | |
| parent | f9d3d432d135253357ba457ecd0e4f68f12a4584 (diff) | |
Fix build errors using Makefile.mips
Broken by earlier ARM optimizations.
Diffstat (limited to 'silk')
| -rw-r--r-- | silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h | 7 | ||||
| -rw-r--r-- | silk/fixed/warped_autocorrelation_FIX.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h b/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h index fcbd96c8..66eb2ed2 100644 --- a/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h +++ b/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h @@ -41,15 +41,14 @@ POSSIBILITY OF SUCH DAMAGE. #define QS 14 /* Autocorrelations for a warped frequency axis */ -#define OVERRIDE_silk_warped_autocorrelation_FIX -void silk_warped_autocorrelation_FIX( +#define OVERRIDE_silk_warped_autocorrelation_FIX_c +void silk_warped_autocorrelation_FIX_c( opus_int32 *corr, /* O Result [order + 1] */ opus_int *scale, /* O Scaling of the correlation vector */ const opus_int16 *input, /* I Input data to correlate */ const opus_int warping_Q16, /* I Warping coefficient */ const opus_int length, /* I Length of input */ - const opus_int order, /* I Correlation order (even) */ - int arch /* I Run-time architecture */ + const opus_int order /* I Correlation order (even) */ ) { opus_int n, i, lsh; diff --git a/silk/fixed/warped_autocorrelation_FIX.c b/silk/fixed/warped_autocorrelation_FIX.c index 52002a11..5c79553b 100644 --- a/silk/fixed/warped_autocorrelation_FIX.c +++ b/silk/fixed/warped_autocorrelation_FIX.c @@ -37,6 +37,7 @@ POSSIBILITY OF SUCH DAMAGE. /* Autocorrelations for a warped frequency axis */ +#ifndef OVERRIDE_silk_warped_autocorrelation_FIX_c void silk_warped_autocorrelation_FIX_c( opus_int32 *corr, /* O Result [order + 1] */ opus_int *scale, /* O Scaling of the correlation vector */ @@ -88,3 +89,4 @@ void silk_warped_autocorrelation_FIX_c( } silk_assert( corr_QC[ 0 ] >= 0 ); /* If breaking, decrease QC*/ } +#endif /* OVERRIDE_silk_warped_autocorrelation_FIX_c */ |