diff options
| author | Rhishikesh Agashe <Rhishikesh.Agashe@imgtec.com> | 2015-10-07 20:55:12 +0300 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2015-10-07 20:55:12 +0300 |
| commit | c9c2035355b8e028d1b62992b277b0c376634cf3 (patch) | |
| tree | 36a7a9e3a0eb0285b47870f14643bf48d15db823 /silk | |
| parent | 50d6701e2a0352954026caf40383d10dad3a2be4 (diff) | |
Fixes compile problems for MIPS
Brings MIPS in sync with the ARM/SSE optimizations that added "arch" parameters.
Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>
Diffstat (limited to 'silk')
| -rw-r--r-- | silk/fixed/mips/prefilter_FIX_mipsr1.h | 7 | ||||
| -rw-r--r-- | silk/fixed/prefilter_FIX.c | 5 | ||||
| -rw-r--r-- | silk/main.h | 19 |
3 files changed, 10 insertions, 21 deletions
diff --git a/silk/fixed/mips/prefilter_FIX_mipsr1.h b/silk/fixed/mips/prefilter_FIX_mipsr1.h index faf9b48d..21b25688 100644 --- a/silk/fixed/mips/prefilter_FIX_mipsr1.h +++ b/silk/fixed/mips/prefilter_FIX_mipsr1.h @@ -43,15 +43,18 @@ void silk_warped_LPC_analysis_filter_FIX( const opus_int16 input[], /* I Input signal [length] */ const opus_int16 lambda_Q16, /* I Warping factor */ const opus_int length, /* I Length of input signal */ - const opus_int order /* I Filter order (even) */ + const opus_int order, /* I Filter order (even) */ + int arch ) { opus_int n, i; opus_int32 acc_Q11, acc_Q22, tmp1, tmp2, tmp3, tmp4; opus_int32 state_cur, state_next; + (void)arch; + /* Order must be even */ - /*Length must be even */ + /* Length must be even */ silk_assert( ( order & 1 ) == 0 ); silk_assert( ( length & 1 ) == 0 ); diff --git a/silk/fixed/prefilter_FIX.c b/silk/fixed/prefilter_FIX.c index c945dd35..6a8e3515 100644 --- a/silk/fixed/prefilter_FIX.c +++ b/silk/fixed/prefilter_FIX.c @@ -38,6 +38,11 @@ POSSIBILITY OF SUCH DAMAGE. #endif +#if !defined(OVERRIDE_silk_warped_LPC_analysis_filter_FIX) +#define silk_warped_LPC_analysis_filter_FIX(state, res_Q2, coef_Q13, input, lambda_Q16, length, order, arch) \ + ((void)(arch),silk_warped_LPC_analysis_filter_FIX_c(state, res_Q2, coef_Q13, input, lambda_Q16, length, order)) +#endif + /* Prefilter for finding Quantizer input signal */ static OPUS_INLINE void silk_prefilt_FIX( silk_prefilter_state_FIX *P, /* I/O state */ diff --git a/silk/main.h b/silk/main.h index 24d7e66c..2f90d68f 100644 --- a/silk/main.h +++ b/silk/main.h @@ -468,23 +468,4 @@ void silk_encode_indices( opus_int condCoding /* I The type of conditional coding to use */ ); -void silk_warped_LPC_analysis_filter_FIX_c( - opus_int32 state[], /* I/O State [order + 1] */ - opus_int32 res_Q2[], /* O Residual signal [length] */ - const opus_int16 coef_Q13[], /* I Coefficients [order] */ - const opus_int16 input[], /* I Input signal [length] */ - const opus_int16 lambda_Q16, /* I Warping factor */ - const opus_int length, /* I Length of input signal */ - const opus_int order /* I Filter order (even) */ -); - -#if !defined(OVERRIDE_silk_warped_LPC_analysis_filter_FIX) -#define silk_warped_LPC_analysis_filter_FIX(state, res_Q2, coef_Q13, input, lambda_Q16, length, order, arch) \ - ((void)(arch),silk_warped_LPC_analysis_filter_FIX_c(state, res_Q2, coef_Q13, input, lambda_Q16, length, order)) -#endif - -#if !defined(OPUS_X86_MAY_HAVE_SSE4_1) - -#endif - #endif |