diff options
-rw-r--r-- | celt/mips/celt_mipsr1.h | 2 | ||||
-rw-r--r-- | celt/mips/fixed_generic_mipsr1.h | 1 | ||||
-rw-r--r-- | celt/mips/pitch_mipsr1.h | 1 | ||||
-rw-r--r-- | silk/fixed/mips/noise_shape_analysis_FIX_mipsr1.h | 1 | ||||
-rw-r--r-- | silk/fixed/mips/prefilter_FIX_mipsr1.h | 1 | ||||
-rw-r--r-- | silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h | 7 | ||||
-rw-r--r-- | silk/fixed/noise_shape_analysis_FIX.c | 1 | ||||
-rw-r--r-- | silk/fixed/prefilter_FIX.c | 1 | ||||
-rw-r--r-- | silk/mips/NSQ_del_dec_mipsr1.h | 1 | ||||
-rw-r--r-- | silk/mips/macros_mipsr1.h | 9 | ||||
-rw-r--r-- | silk/mips/sigproc_fix_mipsr1.h | 1 |
11 files changed, 7 insertions, 19 deletions
diff --git a/celt/mips/celt_mipsr1.h b/celt/mips/celt_mipsr1.h index 2eebce6b..03915d88 100644 --- a/celt/mips/celt_mipsr1.h +++ b/celt/mips/celt_mipsr1.h @@ -104,7 +104,7 @@ void comb_filter(opus_val32 *y, opus_val32 *x, int T0, int T1, int N, asm volatile("MADD $ac1, %0, %1" : : "r" ((int)MULT16_16_Q15(f,g10)), "r" ((int)x2)); asm volatile("MADD $ac1, %0, %1" : : "r" ((int)MULT16_16_Q15(f,g11)), "r" ((int)ADD32(x3,x1))); asm volatile("MADD $ac1, %0, %1" : : "r" ((int)MULT16_16_Q15(f,g12)), "r" ((int)ADD32(x4,x0))); - + asm volatile("EXTR.W %0,$ac1, %1" : "=r" (res): "i" (15)); y[i] = x[i] + res; diff --git a/celt/mips/fixed_generic_mipsr1.h b/celt/mips/fixed_generic_mipsr1.h index 5354092f..cf885856 100644 --- a/celt/mips/fixed_generic_mipsr1.h +++ b/celt/mips/fixed_generic_mipsr1.h @@ -124,4 +124,3 @@ static inline int MULT16_16_P15(int a, int b) } #endif /* CELT_FIXED_GENERIC_MIPSR1_H */ - diff --git a/celt/mips/pitch_mipsr1.h b/celt/mips/pitch_mipsr1.h index 5f46355a..b85338af 100644 --- a/celt/mips/pitch_mipsr1.h +++ b/celt/mips/pitch_mipsr1.h @@ -152,4 +152,3 @@ static inline void xcorr_kernel(const opus_val16 * x, const opus_val16 * y, opus } #endif /* PITCH_MIPSR1_H */ - diff --git a/silk/fixed/mips/noise_shape_analysis_FIX_mipsr1.h b/silk/fixed/mips/noise_shape_analysis_FIX_mipsr1.h index a498edb9..c30481e4 100644 --- a/silk/fixed/mips/noise_shape_analysis_FIX_mipsr1.h +++ b/silk/fixed/mips/noise_shape_analysis_FIX_mipsr1.h @@ -334,4 +334,3 @@ void silk_noise_shape_analysis_FIX( } RESTORE_STACK; } - diff --git a/silk/fixed/mips/prefilter_FIX_mipsr1.h b/silk/fixed/mips/prefilter_FIX_mipsr1.h index 42ac54c7..faf9b48d 100644 --- a/silk/fixed/mips/prefilter_FIX_mipsr1.h +++ b/silk/fixed/mips/prefilter_FIX_mipsr1.h @@ -134,7 +134,6 @@ static inline void silk_prefilt_FIX( if( lag > 0 ) { for( i = 0; i < length; i++ ) { - /* unrolled loop */ silk_assert( HARM_SHAPE_FIR_TAPS == 3 ); idx = lag + LTP_shp_buf_idx; diff --git a/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h b/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h index 85d75665..e803ef0f 100644 --- a/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h +++ b/silk/fixed/mips/warped_autocorrelation_FIX_mipsr1.h @@ -60,7 +60,6 @@ void silk_warped_autocorrelation_FIX( opus_int32 val; val = 2 * QS - QC; - /* Order must be even */ silk_assert( ( order & 1 ) == 0 ); silk_assert( 2 * QS - QC >= 0 ); @@ -71,14 +70,13 @@ void silk_warped_autocorrelation_FIX( tmp1_QS = silk_LSHIFT32( (opus_int32)input[ n ], QS ); start_1 = tmp1_QS; tmp3_QS = silk_LSHIFT32( (opus_int32)input[ n+1], QS ); - start_2 = tmp3_QS; + start_2 = tmp3_QS; tmp5_QS = silk_LSHIFT32( (opus_int32)input[ n+2], QS ); - start_3 = tmp5_QS; + start_3 = tmp5_QS; tmp7_QS = silk_LSHIFT32( (opus_int32)input[ n+3], QS ); /* Loop over allpass sections */ for( i = 0; i < order; i += 2 ) { - /* Output of allpass section */ tmp2_QS = silk_SMLAWB( state_QS[ i ], state_QS[ i + 1 ] - tmp1_QS, warping_Q16 ); corr_QC[ i ] = __builtin_mips_madd( corr_QC[ i ], tmp1_QS, start_1); @@ -165,4 +163,3 @@ void silk_warped_autocorrelation_FIX( silk_assert( corr_QC[ 0 ] >= 0 ); /* If breaking, decrease QC*/ } #endif /* __WARPED_AUTOCORRELATION_FIX_MIPSR1_H__ */ - diff --git a/silk/fixed/noise_shape_analysis_FIX.c b/silk/fixed/noise_shape_analysis_FIX.c index 29a41c78..22a89f75 100644 --- a/silk/fixed/noise_shape_analysis_FIX.c +++ b/silk/fixed/noise_shape_analysis_FIX.c @@ -449,4 +449,3 @@ void silk_noise_shape_analysis_FIX( RESTORE_STACK; } #endif /* OVERRIDE_silk_noise_shape_analysis_FIX */ - diff --git a/silk/fixed/prefilter_FIX.c b/silk/fixed/prefilter_FIX.c index 9b4213cf..e1753be5 100644 --- a/silk/fixed/prefilter_FIX.c +++ b/silk/fixed/prefilter_FIX.c @@ -216,4 +216,3 @@ static OPUS_INLINE void silk_prefilt_FIX( P->sLTP_shp_buf_idx = LTP_shp_buf_idx; } #endif /* OVERRIDE_silk_prefilt_FIX */ - diff --git a/silk/mips/NSQ_del_dec_mipsr1.h b/silk/mips/NSQ_del_dec_mipsr1.h index 4e6b9805..0a3b4992 100644 --- a/silk/mips/NSQ_del_dec_mipsr1.h +++ b/silk/mips/NSQ_del_dec_mipsr1.h @@ -403,4 +403,3 @@ static inline void silk_noise_shape_quantizer_del_dec( } #endif /* __NSQ_DEL_DEC_MIPSR1_H__ */ - diff --git a/silk/mips/macros_mipsr1.h b/silk/mips/macros_mipsr1.h index 4f5a9762..12ed981a 100644 --- a/silk/mips/macros_mipsr1.h +++ b/silk/mips/macros_mipsr1.h @@ -8,7 +8,7 @@ this list of conditions and the following disclaimer. - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. -- Neither the name of Internet Society, IETF or IETF Trust, nor the +- Neither the name of Internet Society, IETF or IETF Trust, nor the names of specific contributors, may be used to endorse or promote products derived from this software without specific prior written permission. @@ -32,7 +32,7 @@ POSSIBILITY OF SUCH DAMAGE. #define mips_clz(x) __builtin_clz(x) #undef silk_SMULWB -static inline int silk_SMULWB(int a, int b) +static inline int silk_SMULWB(int a, int b) { long long ac; int c; @@ -47,7 +47,7 @@ static inline int silk_SMULWB(int a, int b) #define silk_SMLAWB(a32, b32, c32) ((a32) + silk_SMULWB(b32, c32)) #undef silk_SMULWW -static inline int silk_SMULWW(int a, int b) +static inline int silk_SMULWW(int a, int b) { long long ac; int c; @@ -59,7 +59,7 @@ static inline int silk_SMULWW(int a, int b) } #undef silk_SMLAWW -static inline int silk_SMLAWW(int a, int b, int c) +static inline int silk_SMLAWW(int a, int b, int c) { long long ac; int res; @@ -90,4 +90,3 @@ static inline opus_int32 silk_CLZ32(opus_int32 in32) } #endif /* __SILK_MACROS_MIPSR1_H__ */ - diff --git a/silk/mips/sigproc_fix_mipsr1.h b/silk/mips/sigproc_fix_mipsr1.h index 12d6f7c9..3b0a6953 100644 --- a/silk/mips/sigproc_fix_mipsr1.h +++ b/silk/mips/sigproc_fix_mipsr1.h @@ -63,4 +63,3 @@ static inline int silk_RSHIFT_ROUND(int a, int shift) } #endif /* SILK_SIGPROC_FIX_MIPSR1_H */ - |