Index: third_party/opus/src/silk/biquad_alt.c |
diff --git a/third_party/opus/src/silk/biquad_alt.c b/third_party/opus/src/silk/biquad_alt.c |
index d55f5ee92ec2d9b4217810377a1c4a390f8104f9..54566a43c0013c7b7ed378069a44867cca93231f 100644 |
--- a/third_party/opus/src/silk/biquad_alt.c |
+++ b/third_party/opus/src/silk/biquad_alt.c |
@@ -39,14 +39,13 @@ POSSIBILITY OF SUCH DAMAGE. |
#include "SigProc_FIX.h" |
/* Second order ARMA filter, alternative implementation */ |
-void silk_biquad_alt( |
+void silk_biquad_alt_stride1( |
const opus_int16 *in, /* I input signal */ |
const opus_int32 *B_Q28, /* I MA coefficients [3] */ |
const opus_int32 *A_Q28, /* I AR coefficients [2] */ |
opus_int32 *S, /* I/O State vector [2] */ |
opus_int16 *out, /* O output signal */ |
- const opus_int32 len, /* I signal length (must be even) */ |
- opus_int stride /* I Operate on interleaved signal if > 1 */ |
+ const opus_int32 len /* I signal length (must be even) */ |
) |
{ |
/* DIRECT FORM II TRANSPOSED (uses 2 element state vector) */ |
@@ -61,7 +60,7 @@ void silk_biquad_alt( |
for( k = 0; k < len; k++ ) { |
/* S[ 0 ], S[ 1 ]: Q12 */ |
- inval = in[ k * stride ]; |
+ inval = in[ k ]; |
out32_Q14 = silk_LSHIFT( silk_SMLAWB( S[ 0 ], B_Q28[ 0 ], inval ), 2 ); |
S[ 0 ] = S[1] + silk_RSHIFT_ROUND( silk_SMULWB( out32_Q14, A0_L_Q28 ), 14 ); |
@@ -73,6 +72,50 @@ void silk_biquad_alt( |
S[ 1 ] = silk_SMLAWB( S[ 1 ], B_Q28[ 2 ], inval ); |
/* Scale back to Q0 and saturate */ |
- out[ k * stride ] = (opus_int16)silk_SAT16( silk_RSHIFT( out32_Q14 + (1<<14) - 1, 14 ) ); |
+ out[ k ] = (opus_int16)silk_SAT16( silk_RSHIFT( out32_Q14 + (1<<14) - 1, 14 ) ); |
+ } |
+} |
+ |
+void silk_biquad_alt_stride2_c( |
+ const opus_int16 *in, /* I input signal */ |
+ const opus_int32 *B_Q28, /* I MA coefficients [3] */ |
+ const opus_int32 *A_Q28, /* I AR coefficients [2] */ |
+ opus_int32 *S, /* I/O State vector [4] */ |
+ opus_int16 *out, /* O output signal */ |
+ const opus_int32 len /* I signal length (must be even) */ |
+) |
+{ |
+ /* DIRECT FORM II TRANSPOSED (uses 2 element state vector) */ |
+ opus_int k; |
+ opus_int32 A0_U_Q28, A0_L_Q28, A1_U_Q28, A1_L_Q28, out32_Q14[ 2 ]; |
+ |
+ /* Negate A_Q28 values and split in two parts */ |
+ A0_L_Q28 = ( -A_Q28[ 0 ] ) & 0x00003FFF; /* lower part */ |
+ A0_U_Q28 = silk_RSHIFT( -A_Q28[ 0 ], 14 ); /* upper part */ |
+ A1_L_Q28 = ( -A_Q28[ 1 ] ) & 0x00003FFF; /* lower part */ |
+ A1_U_Q28 = silk_RSHIFT( -A_Q28[ 1 ], 14 ); /* upper part */ |
+ |
+ for( k = 0; k < len; k++ ) { |
+ /* S[ 0 ], S[ 1 ], S[ 2 ], S[ 3 ]: Q12 */ |
+ out32_Q14[ 0 ] = silk_LSHIFT( silk_SMLAWB( S[ 0 ], B_Q28[ 0 ], in[ 2 * k + 0 ] ), 2 ); |
+ out32_Q14[ 1 ] = silk_LSHIFT( silk_SMLAWB( S[ 2 ], B_Q28[ 0 ], in[ 2 * k + 1 ] ), 2 ); |
+ |
+ S[ 0 ] = S[ 1 ] + silk_RSHIFT_ROUND( silk_SMULWB( out32_Q14[ 0 ], A0_L_Q28 ), 14 ); |
+ S[ 2 ] = S[ 3 ] + silk_RSHIFT_ROUND( silk_SMULWB( out32_Q14[ 1 ], A0_L_Q28 ), 14 ); |
+ S[ 0 ] = silk_SMLAWB( S[ 0 ], out32_Q14[ 0 ], A0_U_Q28 ); |
+ S[ 2 ] = silk_SMLAWB( S[ 2 ], out32_Q14[ 1 ], A0_U_Q28 ); |
+ S[ 0 ] = silk_SMLAWB( S[ 0 ], B_Q28[ 1 ], in[ 2 * k + 0 ] ); |
+ S[ 2 ] = silk_SMLAWB( S[ 2 ], B_Q28[ 1 ], in[ 2 * k + 1 ] ); |
+ |
+ S[ 1 ] = silk_RSHIFT_ROUND( silk_SMULWB( out32_Q14[ 0 ], A1_L_Q28 ), 14 ); |
+ S[ 3 ] = silk_RSHIFT_ROUND( silk_SMULWB( out32_Q14[ 1 ], A1_L_Q28 ), 14 ); |
+ S[ 1 ] = silk_SMLAWB( S[ 1 ], out32_Q14[ 0 ], A1_U_Q28 ); |
+ S[ 3 ] = silk_SMLAWB( S[ 3 ], out32_Q14[ 1 ], A1_U_Q28 ); |
+ S[ 1 ] = silk_SMLAWB( S[ 1 ], B_Q28[ 2 ], in[ 2 * k + 0 ] ); |
+ S[ 3 ] = silk_SMLAWB( S[ 3 ], B_Q28[ 2 ], in[ 2 * k + 1 ] ); |
+ |
+ /* Scale back to Q0 and saturate */ |
+ out[ 2 * k + 0 ] = (opus_int16)silk_SAT16( silk_RSHIFT( out32_Q14[ 0 ] + (1<<14) - 1, 14 ) ); |
+ out[ 2 * k + 1 ] = (opus_int16)silk_SAT16( silk_RSHIFT( out32_Q14[ 1 ] + (1<<14) - 1, 14 ) ); |
} |
} |