bw_iir{1,2} progress

This commit is contained in:
Stefano D'Angelo 2025-01-28 08:50:33 +01:00
parent 4487ef2176
commit 1be6e06699
2 changed files with 191 additions and 140 deletions

View File

@ -317,6 +317,12 @@ static inline void bw_iir1_process_multi(
bw_iir1_process1(x[j][i], y[j] + i, s + j, b0, b1, a1); bw_iir1_process1(x[j][i], y[j] + i, s + j, b0, b1, a1);
} }
#define BW_IIR1_COEFFS_COMMON \
const float t = bw_tanf(3.141592653589793f * prewarp_freq * bw_rcpf(sample_rate)); \
const float k = t * cutoff; \
const float d = bw_rcpf(k + prewarp_freq); \
*a1 = d * (k - prewarp_freq);
static inline void bw_iir1_coeffs_ap1( static inline void bw_iir1_coeffs_ap1(
float sample_rate, float sample_rate,
float cutoff, float cutoff,
@ -324,10 +330,7 @@ static inline void bw_iir1_coeffs_ap1(
float * BW_RESTRICT b0, float * BW_RESTRICT b0,
float * BW_RESTRICT b1, float * BW_RESTRICT b1,
float * BW_RESTRICT a1) { float * BW_RESTRICT a1) {
const float t = bw_tanf(3.141592653589793f * prewarp_freq * bw_rcpf(sample_rate)); BW_IIR1_COEFFS_COMMON
const float k = t * cutoff;
const float d = bw_rcpf(k + prewarp_freq);
*a1 = d * (k - prewarp_freq);
*b0 = *a1; *b0 = *a1;
*b1 = 1.f; *b1 = 1.f;
} }
@ -339,10 +342,7 @@ static inline void bw_iir1_coeffs_hp1(
float * BW_RESTRICT b0, float * BW_RESTRICT b0,
float * BW_RESTRICT b1, float * BW_RESTRICT b1,
float * BW_RESTRICT a1) { float * BW_RESTRICT a1) {
const float t = bw_tanf(3.141592653589793f * prewarp_freq * bw_rcpf(sample_rate)); BW_IIR1_COEFFS_COMMON
const float k = t * cutoff;
const float d = bw_rcpf(k + prewarp_freq);
*a1 = d * (k - prewarp_freq);
*b0 = d * prewarp_freq; *b0 = d * prewarp_freq;
*b1 = -*b0; *b1 = -*b0;
} }
@ -355,11 +355,9 @@ static inline void bw_iir1_coeffs_hs1_lin(
float * BW_RESTRICT b0, float * BW_RESTRICT b0,
float * BW_RESTRICT b1, float * BW_RESTRICT b1,
float * BW_RESTRICT a1) { float * BW_RESTRICT a1) {
const float t = bw_tanf(3.141592653589793f * prewarp_freq * bw_rcpf(sample_rate)); cutoff = cutoff * bw_sqrtf(high_gain_lin);
const float k = t * cutoff; BW_IIR1_COEFFS_COMMON
const float d = bw_rcpf(k + prewarp_freq);
const float k2 = high_gain_lin * prewarp_freq; const float k2 = high_gain_lin * prewarp_freq;
*a1 = d * (k - prewarp_freq);
*b0 = d * (k + k2); *b0 = d * (k + k2);
*b1 = d * (k - k2); *b1 = d * (k - k2);
} }
@ -382,10 +380,7 @@ static inline void bw_iir1_coeffs_lp1(
float * BW_RESTRICT b0, float * BW_RESTRICT b0,
float * BW_RESTRICT b1, float * BW_RESTRICT b1,
float * BW_RESTRICT a1) { float * BW_RESTRICT a1) {
const float t = bw_tanf(3.141592653589793f * prewarp_freq * bw_rcpf(sample_rate)); BW_IIR1_COEFFS_COMMON
const float k = t * cutoff;
const float d = bw_rcpf(k + prewarp_freq);
*a1 = d * (k - prewarp_freq);
*b0 = d * k; *b0 = d * k;
*b1 = *b0; *b1 = *b0;
} }
@ -398,11 +393,9 @@ static inline void bw_iir1_coeffs_ls1_lin(
float * BW_RESTRICT b0, float * BW_RESTRICT b0,
float * BW_RESTRICT b1, float * BW_RESTRICT b1,
float * BW_RESTRICT a1) { float * BW_RESTRICT a1) {
const float t = bw_tanf(3.141592653589793f * prewarp_freq * bw_rcpf(sample_rate)); cutoff = cutoff * bw_rcpf(bw_sqrtf(dc_gain_lin));
const float k = t * cutoff; BW_IIR1_COEFFS_COMMON
const float d = bw_rcpf(k + prewarp_freq);
const float k2 = dc_gain_lin * k; const float k2 = dc_gain_lin * k;
*a1 = d * (k - prewarp_freq);
*b0 = d * (k2 + prewarp_freq); *b0 = d * (k2 + prewarp_freq);
*b1 = d * (k2 - prewarp_freq); *b1 = d * (k2 - prewarp_freq);
} }
@ -427,16 +420,15 @@ static inline void bw_iir1_coeffs_mm1(
float * BW_RESTRICT b0, float * BW_RESTRICT b0,
float * BW_RESTRICT b1, float * BW_RESTRICT b1,
float * BW_RESTRICT a1) { float * BW_RESTRICT a1) {
const float t = bw_tanf(3.141592653589793f * prewarp_freq * bw_rcpf(sample_rate)); BW_IIR1_COEFFS_COMMON
const float k = t * cutoff;
const float d = bw_rcpf(k + prewarp_freq);
const float k2 = coeff_x * prewarp_freq; const float k2 = coeff_x * prewarp_freq;
const float k3 = coeff_lp * k; const float k3 = coeff_lp * k;
*a1 = d * (k - prewarp_freq);
*b0 = d * (k3 + k2); *b0 = d * (k3 + k2);
*b1 = d * (k3 - k2); *b1 = d * (k3 - k2);
} }
#undef BW_IIR1_COEFFS_COMMON
#if !defined(BW_CXX_NO_EXTERN_C) && defined(__cplusplus) #if !defined(BW_CXX_NO_EXTERN_C) && defined(__cplusplus)
} }
#endif #endif
@ -451,8 +443,6 @@ namespace Brickworks {
/*** Public C++ API ***/ /*** Public C++ API ***/
//XXX
/*! api_cpp {{{ /*! api_cpp {{{
* ##### Brickworks::iir1Reset * ##### Brickworks::iir1Reset
* ```>>> */ * ```>>> */

View File

@ -296,7 +296,7 @@ static inline void bw_iir2_coeffs_peak_lin(
float cutoff, float cutoff,
float Q, float Q,
float prewarp_freq, float prewarp_freq,
float dc_gain_lin, float peak_gain_lin,
float * BW_RESTRICT b0, float * BW_RESTRICT b0,
float * BW_RESTRICT b1, float * BW_RESTRICT b1,
float * BW_RESTRICT b2, float * BW_RESTRICT b2,
@ -312,7 +312,7 @@ static inline void bw_iir2_coeffs_peak_dB(
float cutoff, float cutoff,
float Q, float Q,
float prewarp_freq, float prewarp_freq,
float dc_gain_dB, float peak_gain_dB,
float * BW_RESTRICT b0, float * BW_RESTRICT b0,
float * BW_RESTRICT b1, float * BW_RESTRICT b1,
float * BW_RESTRICT b2, float * BW_RESTRICT b2,
@ -328,7 +328,7 @@ static inline void bw_iir2_coeffs_peak_lin_bw(
float cutoff, float cutoff,
float bandwidth, float bandwidth,
float prewarp_freq, float prewarp_freq,
float dc_gain_lin, float peak_gain_lin,
float * BW_RESTRICT b0, float * BW_RESTRICT b0,
float * BW_RESTRICT b1, float * BW_RESTRICT b1,
float * BW_RESTRICT b2, float * BW_RESTRICT b2,
@ -344,7 +344,7 @@ static inline void bw_iir2_coeffs_peak_dB_bw(
float cutoff, float cutoff,
float bandwidth, float bandwidth,
float prewarp_freq, float prewarp_freq,
float dc_gain_dB, float peak_gain_dB,
float * BW_RESTRICT b0, float * BW_RESTRICT b0,
float * BW_RESTRICT b1, float * BW_RESTRICT b1,
float * BW_RESTRICT b2, float * BW_RESTRICT b2,
@ -387,8 +387,8 @@ static inline void bw_iir2_reset(
const float d = bw_rcpf(1.f + a1 + a2); const float d = bw_rcpf(1.f + a1 + a2);
const float k = d * x_0; const float k = d * x_0;
*y_0 = k * (b0 + b1 + b2); *y_0 = k * (b0 + b1 + b2);
*s_0 = k * (b1 + b2 - b0 * (a1 + a2)); *s1_0 = k * (b1 + b2 - b0 * (a1 + a2));
*s_1 = k * (b2 + b2 * a1 - a2 * (b0 + b1)); *s2_0 = k * (b2 + b2 * a1 - a2 * (b0 + b1));
} }
static inline void bw_iir2_reset_multi( static inline void bw_iir2_reset_multi(
@ -402,8 +402,50 @@ static inline void bw_iir2_reset_multi(
float a1, float a1,
float a2, float a2,
size_t n_channels) { size_t n_channels) {
if (y_0 != BW_NULL) {
if (s1_0 != BW_NULL) {
if (s2_0 != BW_NULL)
for (size_t i = 0; i < n_channels; i++) for (size_t i = 0; i < n_channels; i++)
bw_iir2_reset(x_0[i], s1_0 + i, s2_0 + i, b0, b1, b2, a1, a2); bw_iir2_reset(x_0[i], y_0 + i, s1_0 + i, s2_0 + i, b0, b1, b2, a1, a2);
else
for (size_t i = 0; i < n_channels; i++) {
float v_s2;
bw_iir2_reset(x_0[i], y_0 + i, s1_0 + i, &v_s2, b0, b1, b2, a1, a2);
}
} else {
if (s2_0 != BW_NULL)
for (size_t i = 0; i < n_channels; i++) {
float v_s1;
bw_iir2_reset(x_0[i], y_0 + i, &v_s1, s2_0 + i, b0, b1, b2, a1, a2);
}
else
for (size_t i = 0; i < n_channels; i++) {
float v_s1, v_s2;
bw_iir2_reset(x_0[i], y_0 + i, &v_s1, &v_s2, b0, b1, b2, a1, a2);
}
}
} else {
if (s1_0 != BW_NULL) {
if (s2_0 != BW_NULL)
for (size_t i = 0; i < n_channels; i++) {
float v_y;
bw_iir2_reset(x_0[i], &v_y, s1_0 + i, s2_0 + i, b0, b1, b2, a1, a2);
}
else
for (size_t i = 0; i < n_channels; i++) {
float v_y, v_s2;
bw_iir2_reset(x_0[i], &v_y, s1_0 + i, &v_s2, b0, b1, b2, a1, a2);
}
} else {
if (s2_0 != BW_NULL)
for (size_t i = 0; i < n_channels; i++) {
float v_y, v_s1;
bw_iir2_reset(x_0[i], &v_y, &v_s1, s2_0 + i, b0, b1, b2, a1, a2);
}
else
; // no need to do anything
}
}
} }
static inline void bw_iir2_process1( static inline void bw_iir2_process1(
@ -453,6 +495,17 @@ static inline void bw_iir2_process_multi(
bw_iir2_process1(x[j][i], y[j] + i, s1 + j, s2 + j, b0, b1, b2, a1, a2); bw_iir2_process1(x[j][i], y[j] + i, s1 + j, s2 + j, b0, b1, b2, a1, a2);
} }
#define BW_IIR2_COEFFS_COMMON \
const float t = bw_tanf(3.141592653589793f * prewarp_freq * bw_rcpf(sample_rate)); \
const float k1 = prewarp_freq * prewarp_freq; \
const float k2 = t * cutoff; \
const float k3 = k2 * k2; \
const float k4 = k2 * prewarp_freq; \
const float k5 = Q * (k1 + k3); \
const float d = bw_rcpf(k5 + k4); \
*a1 = d * (Q + Q) * (k3 - k1); \
*a2 = d * (k5 - k4);
static inline void bw_iir2_coeffs_ap2( static inline void bw_iir2_coeffs_ap2(
float sample_rate, float sample_rate,
float cutoff, float cutoff,
@ -463,15 +516,7 @@ static inline void bw_iir2_coeffs_ap2(
float * BW_RESTRICT b2, float * BW_RESTRICT b2,
float * BW_RESTRICT a1, float * BW_RESTRICT a1,
float * BW_RESTRICT a2) { float * BW_RESTRICT a2) {
const float t = bw_tanf(3.141592653589793f * prewarp_freq * bw_rcpf(sample_rate)); BW_IIR2_COEFFS_COMMON
const float k1 = prewarp_freq * prewarp_freq;
const float k2 = t * cutoff;
const float k3 = k2 * k2;
const float k4 = k2 * prewarp_freq;
const float k5 = Q * (k1 + k3);
const float d = bw_rcpf(k5 + k4);
*a1 = (d + d) * Q * (k3 - k1);
*a2 = d * (k5 - k4);
*b0 = *a2; *b0 = *a2;
*b1 = *a1; *b1 = *a1;
*b2 = 1.f; *b2 = 1.f;
@ -487,15 +532,7 @@ static inline void bw_iir2_coeffs_bp2(
float * BW_RESTRICT b2, float * BW_RESTRICT b2,
float * BW_RESTRICT a1, float * BW_RESTRICT a1,
float * BW_RESTRICT a2) { float * BW_RESTRICT a2) {
const float t = bw_tanf(3.141592653589793f * prewarp_freq * bw_rcpf(sample_rate)); BW_IIR2_COEFFS_COMMON
const float k1 = prewarp_freq * prewarp_freq;
const float k2 = t * cutoff;
const float k3 = k2 * k2;
const float k4 = k2 * prewarp_freq;
const float k5 = Q * (k1 + k3);
const float d = bw_rcpf(k5 + k4);
*a1 = (d + d) * Q * (k3 - k1);
*a2 = d * (k5 - k4);
*b0 = Q * k4; *b0 = Q * k4;
*b1 = 0.f; *b1 = 0.f;
*b2 = -*b0; *b2 = -*b0;
@ -511,15 +548,7 @@ static inline void bw_iir2_coeffs_hp2(
float * BW_RESTRICT b2, float * BW_RESTRICT b2,
float * BW_RESTRICT a1, float * BW_RESTRICT a1,
float * BW_RESTRICT a2) { float * BW_RESTRICT a2) {
const float t = bw_tanf(3.141592653589793f * prewarp_freq * bw_rcpf(sample_rate)); BW_IIR2_COEFFS_COMMON
const float k1 = prewarp_freq * prewarp_freq;
const float k2 = t * cutoff;
const float k3 = k2 * k2;
const float k4 = k2 * prewarp_freq;
const float k5 = Q * (k1 + k3);
const float d = bw_rcpf(k5 + k4);
*a1 = (d + d) * Q * (k3 - k1);
*a2 = d * (k5 - k4);
*b0 = Q * k1; *b0 = Q * k1;
*b1 = -(*b0 + *b0); *b1 = -(*b0 + *b0);
*b2 = *b0; *b2 = *b0;
@ -536,7 +565,17 @@ static inline void bw_iir2_coeffs_hs2_lin(
float * BW_RESTRICT b2, float * BW_RESTRICT b2,
float * BW_RESTRICT a1, float * BW_RESTRICT a1,
float * BW_RESTRICT a2) { float * BW_RESTRICT a2) {
//XXX const float sg = bw_sqrtf(high_gain_lin);
const float ssg = bw_sqrtf(sg);
cutoff = cutoff * ssg;
BW_IIR2_COEFFS_COMMON
const float k6 = k1 * high_gain_lin;
const float k7 = k3 - k3 * sg;
const float k8 = Q * (k7 + k6);
const float k9 = k4 * sg;
*b0 = d * (k8 + k9);
*b1 = d * (Q + Q) * (k7 - k6);
*b2 = d * (k8 - k9);
} }
static inline void bw_iir2_coeffs_hs2_dB( static inline void bw_iir2_coeffs_hs2_dB(
@ -563,15 +602,7 @@ static inline void bw_iir2_coeffs_lp2(
float * BW_RESTRICT b2, float * BW_RESTRICT b2,
float * BW_RESTRICT a1, float * BW_RESTRICT a1,
float * BW_RESTRICT a2) { float * BW_RESTRICT a2) {
const float t = bw_tanf(3.141592653589793f * prewarp_freq * bw_rcpf(sample_rate)); BW_IIR2_COEFFS_COMMON
const float k1 = prewarp_freq * prewarp_freq;
const float k2 = t * cutoff;
const float k3 = k2 * k2;
const float k4 = k2 * prewarp_freq;
const float k5 = Q * (k1 + k3);
const float d = bw_rcpf(k5 + k4);
*a1 = (d + d) * Q * (k3 - k1);
*a2 = d * (k5 - k4);
*b0 = Q * k3; *b0 = Q * k3;
*b1 = *b0 + *b0; *b1 = *b0 + *b0;
*b2 = *b0; *b2 = *b0;
@ -588,7 +619,16 @@ static inline void bw_iir2_coeffs_ls2_lin(
float * BW_RESTRICT b2, float * BW_RESTRICT b2,
float * BW_RESTRICT a1, float * BW_RESTRICT a1,
float * BW_RESTRICT a2) { float * BW_RESTRICT a2) {
//XXX const float sg = bw_sqrtf(dc_gain_lin);
const float issg = bw_rcpf(bw_sqrtf(sg));
cutoff = cutoff * issg;
BW_IIR2_COEFFS_COMMON
const float k6 = k3 * (dc_gain_lin - sg);
const float k7 = Q * (k6 + k1);
const float k8 = k4 * sg
*b0 = d * (k7 + k8);
*b1 = d * (Q + Q) * (k6 - k1);
*b2 = d * (k7 - k8);
} }
static inline void bw_iir2_coeffs_ls2_dB( static inline void bw_iir2_coeffs_ls2_dB(
@ -619,22 +659,14 @@ static inline void bw_iir2_coeffs_mm2(
float * BW_RESTRICT b2, float * BW_RESTRICT b2,
float * BW_RESTRICT a1, float * BW_RESTRICT a1,
float * BW_RESTRICT a2) { float * BW_RESTRICT a2) {
const float t = bw_tanf(3.141592653589793f * prewarp_freq * bw_rcpf(sample_rate)); BW_IIR2_COEFFS_COMMON
const float k1 = prewarp_freq * prewarp_freq; const float k6 = k3 * (coeff_lp + coeff_x);
const float k2 = t * cutoff; const float k7 = k1 * (coeff_hp + coeff_x);
const float k3 = k2 * k2; const float k8 = k4 * (Q * coeff_bp + coeff_x);
const float k4 = k2 * prewarp_freq; const float k9 = Q * (k6 + k7);
const float k5 = Q * (k1 + k3); *b0 = d * (k9 + k8);
const float d = bw_rcpf(k5 + k4); *b1 = d * (Q + Q) * (k6 - k7);
*a1 = (d + d) * Q * (k3 - k1); *b2 = d * (k9 - k8);
*a2 = d * (k5 - k4);
const float k6 = k3 * (coeff_x + coeff_lp);
const float k7 = k4 * (coeff_x + coeff_bp);
const float k8 = k1 * (coeff_x + coeff_hp);
const float k9 = Q * (k6 + k8);
*b0 = d * (k9 + k7);
*b1 = d * (Q + Q) * (k6 - k8);
*b2 = d * (k9 - k7);
} }
static inline void bw_iir2_coeffs_notch( static inline void bw_iir2_coeffs_notch(
@ -647,15 +679,7 @@ static inline void bw_iir2_coeffs_notch(
float * BW_RESTRICT b2, float * BW_RESTRICT b2,
float * BW_RESTRICT a1, float * BW_RESTRICT a1,
float * BW_RESTRICT a2) { float * BW_RESTRICT a2) {
const float t = bw_tanf(3.141592653589793f * prewarp_freq * bw_rcpf(sample_rate)); BW_IIR2_COEFFS_COMMON
const float k1 = prewarp_freq * prewarp_freq;
const float k2 = t * cutoff;
const float k3 = k2 * k2;
const float k4 = k2 * prewarp_freq;
const float k5 = Q * (k1 + k3);
const float d = bw_rcpf(k5 + k4);
*a1 = (d + d) * Q * (k3 - k1);
*a2 = d * (k5 - k4);
*b0 = d * k5; *b0 = d * k5;
*b1 = *a1; *b1 = *a1;
*b2 = *b0; *b2 = *b0;
@ -666,13 +690,18 @@ static inline void bw_iir2_coeffs_peak_lin(
float cutoff, float cutoff,
float Q, float Q,
float prewarp_freq, float prewarp_freq,
float dc_gain_lin, float peak_gain_lin,
float * BW_RESTRICT b0, float * BW_RESTRICT b0,
float * BW_RESTRICT b1, float * BW_RESTRICT b1,
float * BW_RESTRICT b2, float * BW_RESTRICT b2,
float * BW_RESTRICT a1, float * BW_RESTRICT a1,
float * BW_RESTRICT a2) { float * BW_RESTRICT a2) {
//XXX BW_IIR2_COEFFS_COMMON
const float k6 = Q * (k1 + k3);
const float k7 = k4 * peak_gain_lin;
*b0 = d * (k6 + k7);
*b1 = *a1;
*b2 = d * (k6 - k7);
} }
static inline void bw_iir2_coeffs_peak_dB( static inline void bw_iir2_coeffs_peak_dB(
@ -680,13 +709,13 @@ static inline void bw_iir2_coeffs_peak_dB(
float cutoff, float cutoff,
float Q, float Q,
float prewarp_freq, float prewarp_freq,
float dc_gain_dB, float peak_gain_dB,
float * BW_RESTRICT b0, float * BW_RESTRICT b0,
float * BW_RESTRICT b1, float * BW_RESTRICT b1,
float * BW_RESTRICT b2, float * BW_RESTRICT b2,
float * BW_RESTRICT a1, float * BW_RESTRICT a1,
float * BW_RESTRICT a2) { float * BW_RESTRICT a2) {
bw_iir2_coeffs_peak_lin(sample_rate, cutoff, Q, prewarp_freq, bw_dB2linf(dc_gain_dB), b0, b1, b2, a1, a2); bw_iir2_coeffs_peak_lin(sample_rate, cutoff, Q, prewarp_freq, bw_dB2linf(peak_gain_dB), b0, b1, b2, a1, a2);
} }
static inline void bw_iir2_coeffs_peak_lin_bw( static inline void bw_iir2_coeffs_peak_lin_bw(
@ -694,13 +723,15 @@ static inline void bw_iir2_coeffs_peak_lin_bw(
float cutoff, float cutoff,
float bandwidth, float bandwidth,
float prewarp_freq, float prewarp_freq,
float dc_gain_lin, float peak_gain_lin,
float * BW_RESTRICT b0, float * BW_RESTRICT b0,
float * BW_RESTRICT b1, float * BW_RESTRICT b1,
float * BW_RESTRICT b2, float * BW_RESTRICT b2,
float * BW_RESTRICT a1, float * BW_RESTRICT a1,
float * BW_RESTRICT a2) { float * BW_RESTRICT a2) {
//XXX const float k6 = bw_pow2f(bandwidth);
const float Q = bw_sqrtf(k6 * peak_gain_lin) * bw_rcpf(k6 - 1.f);
bw_iir2_coeffs_peak_lin(sample_rate, cutoff, Q, prewarp_freq, peak_gain_lin, b0, b1, b2, a1, a2);
} }
static inline void bw_iir2_coeffs_peak_dB_bw( static inline void bw_iir2_coeffs_peak_dB_bw(
@ -708,15 +739,17 @@ static inline void bw_iir2_coeffs_peak_dB_bw(
float cutoff, float cutoff,
float bandwidth, float bandwidth,
float prewarp_freq, float prewarp_freq,
float dc_gain_dB, float peak_gain_dB,
float * BW_RESTRICT b0, float * BW_RESTRICT b0,
float * BW_RESTRICT b1, float * BW_RESTRICT b1,
float * BW_RESTRICT b2, float * BW_RESTRICT b2,
float * BW_RESTRICT a1, float * BW_RESTRICT a1,
float * BW_RESTRICT a2) { float * BW_RESTRICT a2) {
bw_iir2_coeffs_peak_lin_bw(sample_rate, cutoff, bandwidth, prewarp_freq, bw_dB2linf(dc_gain_dB), b0, b1, b2, a1, a2); bw_iir2_coeffs_peak_lin_bw(sample_rate, cutoff, bandwidth, prewarp_freq, bw_dB2linf(peak_gain_dB), b0, b1, b2, a1, a2);
} }
#undef BW_IIR2_COEFFS_COMMON
#if !defined(BW_CXX_NO_EXTERN_C) && defined(__cplusplus) #if !defined(BW_CXX_NO_EXTERN_C) && defined(__cplusplus)
} }
#endif #endif
@ -736,30 +769,41 @@ namespace Brickworks {
* ```>>> */ * ```>>> */
template<size_t N_CHANNELS> template<size_t N_CHANNELS>
void iir2Reset( void iir2Reset(
const float * BW_RESTRICT x0, const float * x0,
float * BW_RESTRICT const * BW_RESTRICT s0, float * y0,
float * BW_RESTRICT s10,
float * BW_RESTRICT s20,
float b0, float b0,
float b1, float b1,
float a1); float b2,
float a1,
float a2);
# ifndef BW_CXX_NO_ARRAY # ifndef BW_CXX_NO_ARRAY
template<size_t N_CHANNELS> template<size_t N_CHANNELS>
void iir2Reset( void iir2Reset(
std::array<float, N_CHANNELS> x0, std::array<float, N_CHANNELS> x0,
std::array<float * BW_RESTRICT, N_CHANNELS> s0, std::array<float, N_CHANNELS> * BW_RESTRICT y0,
std::array<float, N_CHANNELS> * BW_RESTRICT s10,
std::array<float, N_CHANNELS> * BW_RESTRICT s20,
float b0, float b0,
float b1, float b1,
float a1); float b2,
float a1,
float a2);
# endif # endif
template<size_t N_CHANNELS> template<size_t N_CHANNELS>
void iir2Process( void iir2Process(
const float * const * x, const float * const * x,
float * const * y, float * const * y,
float * BW_RESTRICT const * BW_RESTRICT s, float * BW_RESTRICT s1,
float * BW_RESTRICT s2,
float b0, float b0,
float b1, float b1,
float b2,
float a1, float a1,
float a2,
size_t nSamples); size_t nSamples);
# ifndef BW_CXX_NO_ARRAY # ifndef BW_CXX_NO_ARRAY
@ -767,10 +811,13 @@ template<size_t N_CHANNELS>
void iir2Process( void iir2Process(
std::array<const float *, N_CHANNELS> x, std::array<const float *, N_CHANNELS> x,
std::array<float *, N_CHANNELS> y, std::array<float *, N_CHANNELS> y,
std::array<float * BW_RESTRICT, N_CHANNELS> s, std::array<float, N_CHANNELS> * BW_RESTRICT s1,
std::array<float, N_CHANNELS> * BW_RESTRICT s2,
float b0, float b0,
float b1, float b1,
float b2,
float a1, float a1,
float a2,
size_t nSamples); size_t nSamples);
# endif # endif
/*! <<<``` /*! <<<```
@ -783,23 +830,31 @@ void iir2Process(
template<size_t N_CHANNELS> template<size_t N_CHANNELS>
inline void iir2Reset( inline void iir2Reset(
const float * BW_RESTRICT x0, const float * x0,
float * BW_RESTRICT const * BW_RESTRICT s0, float * y0,
float * BW_RESTRICT s10,
float * BW_RESTRICT s20,
float b0, float b0,
float b1, float b1,
float a1) { float b2,
bw_iir2_reset_multi(x0, s0, b0, b1, a1, N_CHANNELS); float a1,
float a2) {
bw_iir2_reset_multi(x0, y0, s10, s20, b0, b1, b2, a1, a2, N_CHANNELS);
} }
# ifndef BW_CXX_NO_ARRAY # ifndef BW_CXX_NO_ARRAY
template<size_t N_CHANNELS> template<size_t N_CHANNELS>
inline void iir2Reset( inline void iir2Reset(
std::array<float, N_CHANNELS> x0, std::array<float, N_CHANNELS> x0,
std::array<float * BW_RESTRICT, N_CHANNELS> s0, std::array<float, N_CHANNELS> * BW_RESTRICT y0,
std::array<float, N_CHANNELS> * BW_RESTRICT s10,
std::array<float, N_CHANNELS> * BW_RESTRICT s20,
float b0, float b0,
float b1, float b1,
float a1) { float b2,
iir2Reset<N_CHANNELS>(x0.data(), s0.data(), b0, b1, a1); float a1,
float a2) {
iir2Reset<N_CHANNELS>(x0.data(), y0 != nullptr ? y0.data() : nullptr, s10 != nullptr ? s10.data() : nullptr, s20 != nullptr ? s20.data() : nullptr, b0, b1, b2, a1, a2);
} }
# endif # endif
@ -807,12 +862,15 @@ template<size_t N_CHANNELS>
inline void iir2Process( inline void iir2Process(
const float * const * x, const float * const * x,
float * const * y, float * const * y,
float * BW_RESTRICT const * BW_RESTRICT s, float * BW_RESTRICT s1,
float * BW_RESTRICT s2,
float b0, float b0,
float b1, float b1,
float b2,
float a1, float a1,
float a2,
size_t nSamples) { size_t nSamples) {
bw_iir2_process_multi(x, y, s, b0, b1, a1, N_CHANNELS, nSamples); bw_iir2_process_multi(x, y, s1, s2, b0, b1, b2, a1, a2, N_CHANNELS, nSamples);
} }
# ifndef BW_CXX_NO_ARRAY # ifndef BW_CXX_NO_ARRAY
@ -820,12 +878,15 @@ template<size_t N_CHANNELS>
inline void iir2Process( inline void iir2Process(
std::array<const float *, N_CHANNELS> x, std::array<const float *, N_CHANNELS> x,
std::array<float *, N_CHANNELS> y, std::array<float *, N_CHANNELS> y,
std::array<float * BW_RESTRICT, N_CHANNELS> s, std::array<float, N_CHANNELS> * BW_RESTRICT s1,
std::array<float, N_CHANNELS> * BW_RESTRICT s2,
float b0, float b0,
float b1, float b1,
float b2,
float a1, float a1,
float a2,
size_t nSamples) { size_t nSamples) {
iir2Process<N_CHANNELS>(x.data(), y.data(), s.data(), b0, b1, a1, nSamples); iir2Process<N_CHANNELS>(x.data(), y.data(), s1.data(), s2.data(), b0, b1, b2, a1, a2, nSamples);
} }
# endif # endif