diff --git a/celt/mips/celt_mipsr1.h b/celt/mips/celt_mipsr1.h index 2eebce6bffe462554476a9421b62de1d42a38251..03915d8817c6f0bab1ccb31a563d02658d795ebe 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 5354092f065d8814b991b22fe539fe5f8205c39d..cf885856807a8db3c9da0f82abe807f0dc80effc 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 5f46355a5e6853a0753aef42a2cae14143753622..b85338af6fff0cb3b76bdb5e70ac3e91c7cff400 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 a498edb98e6d1ce564aec5fa4cd3b82d3436899f..c30481e43751dc00fea02593cf34302ed639779f 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 42ac54c74f749ded1599261ee70574908d372f3d..faf9b48df0c8bfd9e7b67bbff78ceb52ef6f3eb7 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 85d75665b187dba6b644d6b1dac927c6ad1c95a7..e803ef0fceb04b3ca15264cb3a5edd8e971887b9 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 29a41c78f454cb50e2c6668022df7abf865ed71b..22a89f75aec0fc8d624409df861cbb6c2ca38595 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 9b4213cfdedc4ad758fa291759102dccc188fe79..e1753be593a559d191dc38471edb23ae9d84be3d 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 4e6b9805d43eb7f4195a74b3dcde1f36747088c0..0a3b4992e6694f056cb0d266bac3eb2b70b02284 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 4f5a97628e73cfce6d591fbff2c186313e74b0c8..12ed981a6ee45b080d9d1160206269a3590db041 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 12d6f7c9ffdefe037bef3401a77fdfd01f42cf90..3b0a6953656d97318f3aa83ebba9f208be1bd88b 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 */ -