diff --git a/examples/fx_eq_3band/vst3/Makefile b/examples/fx_eq_3band/vst3/Makefile
index 1451f01..90459dc 100644
--- a/examples/fx_eq_3band/vst3/Makefile
+++ b/examples/fx_eq_3band/vst3/Makefile
@@ -4,3 +4,6 @@ NAME := bw_example_fx_eq_3band
SOURCES = ${SOURCES_COMMON} ${ROOT_DIR}/../src/bw_example_fx_eq_3band.c
include ${ROOT_DIR}/../../common/vst3/vst3.mk
+
+CXXFLAGS += -DRELEASE=1 -DNDEBUG -DBW_NO_DEBUG
+#CXXFLAGS += -DDEVELOPMENT=1 -DBW_DEBUG_DEEP
diff --git a/examples/fxpp_eq_3band/vst3/Makefile b/examples/fxpp_eq_3band/vst3/Makefile
index c863a52..1ab370c 100644
--- a/examples/fxpp_eq_3band/vst3/Makefile
+++ b/examples/fxpp_eq_3band/vst3/Makefile
@@ -4,3 +4,6 @@ NAME := bw_example_fxpp_eq_3band
SOURCES = ${SOURCES_COMMON} ${ROOT_DIR}/../src/bw_example_fxpp_eq_3band.cpp
include ${ROOT_DIR}/../../common/vst3/vst3.mk
+
+CXXFLAGS += -DRELEASE=1 -DNDEBUG -DBW_NO_DEBUG
+#CXXFLAGS += -DDEVELOPMENT=1 -DBW_DEBUG_DEEP
diff --git a/include/bw_hs2.h b/include/bw_hs2.h
index 215a549..7640401 100644
--- a/include/bw_hs2.h
+++ b/include/bw_hs2.h
@@ -213,8 +213,9 @@ static inline void bw_hs2_set_cutoff(
* `value` must be finite and positive.
*
* By the time `bw_hs2_update_coeffs_ctrl()`, `bw_hs2_update_coeffs_audio()`,
- * `bw_hs2_process()`, or `bw_hs2_process_multi()` is called,
- * `cutoff * bw_sqrtf(bw_sqrtf(high_gain))` must be in [`1e-6f`, `1e12f`].
+ * `bw_hs2_process1()`, `bw_hs2_process()`, or `bw_hs2_process_multi()` is
+ * called, `cutoff * bw_sqrtf(bw_sqrtf(high_gain))` must be in [`1e-6f`,
+ * `1e12f`].
*
* Default value: `1e3f`.
*
@@ -268,8 +269,9 @@ static inline void bw_hs2_set_high_gain_lin(
* `value` must be finite and non-negative.
*
* By the time `bw_hs2_update_coeffs_ctrl()`, `bw_hs2_update_coeffs_audio()`,
- * `bw_hs2_process()`, or `bw_hs2_process_multi()` is called,
- * `cutoff * bw_sqrtf(bw_sqrtf(high_gain))` must be in [`1e-6f`, `1e12f`].
+ * `bw_hs2_process1()`, `bw_hs2_process()`, or `bw_hs2_process_multi()` is
+ * called, `cutoff * bw_sqrtf(bw_sqrtf(high_gain))` must be in [`1e-6f`,
+ * `1e12f`].
*
* Default value: `1.f`.
*
@@ -285,8 +287,9 @@ static inline void bw_hs2_set_high_gain_dB(
* `value` must be finite if positive.
*
* By the time `bw_hs2_update_coeffs_ctrl()`, `bw_hs2_update_coeffs_audio()`,
- * `bw_hs2_process()`, or `bw_hs2_process_multi()` is called,
- * `cutoff * bw_sqrtf(bw_sqrtf(high_gain))` must be in [`1e-6f`, `1e12f`].
+ * `bw_hs2_process1()`, `bw_hs2_process()`, or `bw_hs2_process_multi()` is
+ * called, `cutoff * bw_sqrtf(bw_sqrtf(high_gain))` must be in [`1e-6f`,
+ * `1e12f`].
*
* Default value: `0.f`.
*
@@ -659,7 +662,7 @@ static inline void bw_hs2_set_prewarp_freq(
BW_ASSERT(bw_is_finite(value));
BW_ASSERT(value >= 1e-6f && value <= 1e12f);
- bw_mm2_set_prewarp_freq(&coeffs->mm2_coeffs, value);
+ coeffs->prewarp_freq = value;
BW_ASSERT_DEEP(bw_hs2_coeffs_is_valid(coeffs));
BW_ASSERT_DEEP(coeffs->state >= bw_hs2_coeffs_state_init);
diff --git a/include/bw_ls2.h b/include/bw_ls2.h
index d7880b9..dc69121 100644
--- a/include/bw_ls2.h
+++ b/include/bw_ls2.h
@@ -30,6 +30,12 @@
*
* - Version 1.0.0:
*
+ * - Added
bw_ls2_reset_state_multi()
and updated C++
+ * API in this regard.
+ * - Now
bw_ls2_reset_state()
returns the initial output
+ * value.
+ * - Added overloaded C++
reset()
functions taking
+ * arrays as arguments.
* bw_ls2_process()
and
* bw_ls2_process_multi()
now use size_t
* to count samples and channels.
@@ -41,6 +47,8 @@
* - Removed usage of reserved identifiers.
* - Added pragmas to silence bogus GCC uninitialized variable
* warnings.
+ * - Clearly specified parameter validity ranges.
+ * - Added debugging code.
*
*
* - Version 0.6.0:
@@ -93,51 +101,86 @@ typedef struct bw_ls2_state bw_ls2_state;
*
* #### bw_ls2_init()
* ```>>> */
-static inline void bw_ls2_init(bw_ls2_coeffs *BW_RESTRICT coeffs);
+static inline void bw_ls2_init(
+ bw_ls2_coeffs * BW_RESTRICT coeffs);
/*! <<<```
* Initializes input parameter values in `coeffs`.
*
* #### bw_ls2_set_sample_rate()
* ```>>> */
-static inline void bw_ls2_set_sample_rate(bw_ls2_coeffs *BW_RESTRICT coeffs, float sample_rate);
+static inline void bw_ls2_set_sample_rate(
+ bw_ls2_coeffs * BW_RESTRICT coeffs,
+ float sample_rate);
/*! <<<```
* Sets the `sample_rate` (Hz) value in `coeffs`.
*
* #### bw_ls2_reset_coeffs()
* ```>>> */
-static inline void bw_ls2_reset_coeffs(bw_ls2_coeffs *BW_RESTRICT coeffs);
+static inline void bw_ls2_reset_coeffs(
+ bw_ls2_coeffs * BW_RESTRICT coeffs);
/*! <<<```
* Resets coefficients in `coeffs` to assume their target values.
*
* #### bw_ls2_reset_state()
* ```>>> */
-static inline void bw_ls2_reset_state(const bw_ls2_coeffs *BW_RESTRICT coeffs, bw_ls2_state *BW_RESTRICT state, float x_0);
+static inline float bw_ls2_reset_state(
+ const bw_ls2_coeffs * BW_RESTRICT coeffs,
+ bw_ls2_state * BW_RESTRICT state,
+ float x_0);
/*! <<<```
* Resets the given `state` to its initial values using the given `coeffs`
* and the quiescent/initial input value `x_0`.
*
+ * Returns the corresponding quiescent/initial output value.
+ *
+ * #### bw_ls2_reset_state_multi()
+ * ```>>> */
+static inline void bw_ls2_reset_state_multi(
+ const bw_ls2_coeffs * BW_RESTRICT coeffs,
+ bw_ls2_state * BW_RESTRICT const * BW_RESTRICT state,
+ const float * x_0,
+ float * y_0,
+ size_t n_channels);
+/*! <<<```
+ * Resets each of the `n_channels` `state`s to its initial values using the
+ * given `coeffs` and the corresponding quiescent/initial input value in the
+ * `x_0` array.
+ *
+ * The corresponding quiescent/initial output values are written into the
+ * `y_0` array, if not `NULL`.
+ *
* #### bw_ls2_update_coeffs_ctrl()
* ```>>> */
-static inline void bw_ls2_update_coeffs_ctrl(bw_ls2_coeffs *BW_RESTRICT coeffs);
+static inline void bw_ls2_update_coeffs_ctrl(
+ bw_ls2_coeffs * BW_RESTRICT coeffs);
/*! <<<```
* Triggers control-rate update of coefficients in `coeffs`.
*
* #### bw_ls2_update_coeffs_audio()
* ```>>> */
-static inline void bw_ls2_update_coeffs_audio(bw_ls2_coeffs *BW_RESTRICT coeffs);
+static inline void bw_ls2_update_coeffs_audio(
+ bw_ls2_coeffs * BW_RESTRICT coeffs);
/*! <<<```
* Triggers audio-rate update of coefficients in `coeffs`.
*
* #### bw_ls2_process1()
* ```>>> */
-static inline float bw_ls2_process1(const bw_ls2_coeffs *BW_RESTRICT coeffs, bw_ls2_state *BW_RESTRICT state, float x);
+static inline float bw_ls2_process1(
+ const bw_ls2_coeffs * BW_RESTRICT coeffs,
+ bw_ls2_state * BW_RESTRICT state,
+ float x);
/*! <<<```
* Processes one input sample `x` using `coeffs`, while using and updating
* `state`. Returns the corresponding output sample.
*
* #### bw_ls2_process()
* ```>>> */
-static inline void bw_ls2_process(bw_ls2_coeffs *BW_RESTRICT coeffs, bw_ls2_state *BW_RESTRICT state, const float *x, float *y, size_t n_samples);
+static inline void bw_ls2_process(
+ bw_ls2_coeffs * BW_RESTRICT coeffs,
+ bw_ls2_state * BW_RESTRICT state,
+ const float * x,
+ float * y,
+ size_t n_samples);
/*! <<<```
* Processes the first `n_samples` of the input buffer `x` and fills the
* first `n_samples` of the output buffer `y`, while using and updating both
@@ -145,7 +188,13 @@ static inline void bw_ls2_process(bw_ls2_coeffs *BW_RESTRICT coeffs, bw_ls2_stat
*
* #### bw_ls2_process_multi()
* ```>>> */
-static inline void bw_ls2_process_multi(bw_ls2_coeffs *BW_RESTRICT coeffs, bw_ls2_state *BW_RESTRICT const *BW_RESTRICT state, const float * const *x, float * const *y, size_t n_channels, size_t n_samples);
+static inline void bw_ls2_process_multi(
+ bw_ls2_coeffs * BW_RESTRICT coeffs,
+ bw_ls2_state * BW_RESTRICT const * BW_RESTRICT state,
+ const float * const * x,
+ float * const * y,
+ size_t n_channels,
+ size_t n_samples);
/*! <<<```
* Processes the first `n_samples` of the `n_channels` input buffers `x` and
* fills the first `n_samples` of the `n_channels` output buffers `y`, while
@@ -154,37 +203,120 @@ static inline void bw_ls2_process_multi(bw_ls2_coeffs *BW_RESTRICT coeffs, bw_ls
*
* #### bw_ls2_set_cutoff()
* ```>>> */
-static inline void bw_ls2_set_cutoff(bw_ls2_coeffs *BW_RESTRICT coeffs, float value);
+static inline void bw_ls2_set_cutoff(
+ bw_ls2_coeffs * BW_RESTRICT coeffs,
+ float value);
/*! <<<```
* Sets the cutoff frequency `value` (Hz) in `coeffs`.
*
+ * `value` must be finite and positive.
+ *
+ * By the time `bw_ls2_update_coeffs_ctrl()`, `bw_ls2_update_coeffs_audio()`,
+ * `bw_ls2_process1()`, `bw_ls2_process()`, or `bw_ls2_process_multi()` is
+ * called, `cutoff * bw_rcpf(bw_sqrtf(bw_sqrtf(dc_gain)))` must be in
+ * [`1e-6f`, `1e12f`].
+ *
* Default value: `1e3f`.
*
* #### bw_ls2_set_Q()
* ```>>> */
-static inline void bw_ls2_set_Q(bw_ls2_coeffs *BW_RESTRICT coeffs, float value);
+static inline void bw_ls2_set_Q(
+ bw_ls2_coeffs * BW_RESTRICT coeffs,
+ float value);
/*! <<<```
* Sets the quality factor to the given `value` in `coeffs`.
*
- * `value` must be equal or bigger than `0.5f`.
+ * Valid range: [`1e-6f`, `1e6f`].
*
* Default value: `0.5f`.
*
+ * #### bw_ls2_set_prewarp_at_cutoff()
+ * ```>>> */
+static inline void bw_ls2_set_prewarp_at_cutoff(
+ bw_ls2_coeffs * BW_RESTRICT coeffs,
+ char value);
+/*! <<<```
+ * Sets whether bilinear transform prewarping frequency should match the
+ * cutoff frequency (non-`0`) or not (`0`).
+ *
+ * Default value: non-`0` (on).
+ *
+ * #### bw_ls2_set_prewarp_freq()
+ * ```>>> */
+static inline void bw_ls2_set_prewarp_freq(
+ bw_ls2_coeffs * BW_RESTRICT coeffs,
+ float value);
+/*! <<<```
+ * Sets the prewarping frequency `value` (Hz) in `coeffs`.
+ *
+ * Only used when the prewarp\_at\_cutoff parameter is off and however
+ * internally limited to avoid instability.
+ *
+ * Valid range: [`1e-6f`, `1e12f`].
+ *
+ * Default value: `1e3f`.
+ *
* #### bw_ls2_set_dc_gain_lin()
* ```>>> */
-static inline void bw_ls2_set_dc_gain_lin(bw_ls2_coeffs *BW_RESTRICT coeffs, float value);
+static inline void bw_ls2_set_dc_gain_lin(
+ bw_ls2_coeffs * BW_RESTRICT coeffs,
+ float value);
/*! <<<```
* Sets the dc gain parameter to the given `value` (linear gain) in `coeffs`.
*
- * Default value: `0.f`.
+ * `value` must be finite and greater than or equal to `1e-30f`.
+ *
+ * By the time `bw_ls2_update_coeffs_ctrl()`, `bw_ls2_update_coeffs_audio()`,
+ * `bw_ls2_process1()`, `bw_ls2_process()`, or `bw_ls2_process_multi()` is
+ * called, `cutoff * bw_rcpf(bw_sqrtf(bw_sqrtf(dc_gain)))` must be in
+ * [`1e-6f`, `1e12f`].
+ *
+ * Default value: `1.f`.
*
* #### bw_ls2_set_dc_gain_dB()
* ```>>> */
-static inline void bw_ls2_set_dc_gain_dB(bw_ls2_coeffs *BW_RESTRICT coeffs, float value);
+static inline void bw_ls2_set_dc_gain_dB(
+ bw_ls2_coeffs * BW_RESTRICT coeffs,
+ float value);
/*! <<<```
* Sets the dc gain parameter to the given `value` (dB) in `coeffs`.
*
- * Default value: `-INFINITY`.
+ * `value` must be finite and greater than or equal to `-600.f`.
+ *
+ * By the time `bw_ls2_update_coeffs_ctrl()`, `bw_ls2_update_coeffs_audio()`,
+ * `bw_ls2_process1()`, `bw_ls2_process()`, or `bw_ls2_process_multi()` is
+ * called, `cutoff * bw_rcpf(bw_sqrtf(bw_sqrtf(dc_gain)))` must be in
+ * [`1e-6f`, `1e12f`].
+ *
+ * Default value: `0.f`.
+ *
+ * #### bw_ls2_coeffs_is_valid()
+ * ```>>> */
+static inline char bw_ls2_coeffs_is_valid(
+ const bw_ls2_coeffs * BW_RESTRICT coeffs);
+/*! <<<```
+ * Tries to determine whether `coeffs` is valid and returns non-`0` if it
+ * seems to be the case and `0` if it is certainly not. False positives are
+ * possible, false negatives are not.
+ *
+ * `coeffs` must at least point to a readable memory block of size greater
+ * than or equal to that of `bw_ls2_coeffs`.
+ *
+ * #### bw_ls2_state_is_valid()
+ * ```>>> */
+static inline char bw_ls2_state_is_valid(
+ const bw_ls2_coeffs * BW_RESTRICT coeffs,
+ const bw_ls2_state * BW_RESTRICT state);
+/*! <<<```
+ * Tries to determine whether `state` is valid and returns non-`0` if it
+ * seems to be the case and `0` if it is certainly not. False positives are
+ * possible, false negatives are not.
+ *
+ * If `coeffs` is not `NULL` extra cross-checks might be performed (`state`
+ * is supposed to be associated to `coeffs`).
+ *
+ * `state` must at least point to a readable memory block of size greater
+ * than or equal to that of `bw_ls2_state`.
* }}} */
#ifdef __cplusplus
@@ -203,95 +335,280 @@ static inline void bw_ls2_set_dc_gain_dB(bw_ls2_coeffs *BW_RESTRICT coeffs, floa
extern "C" {
#endif
+#ifdef BW_DEBUG_DEEP
+enum bw_ls2_coeffs_state {
+ bw_ls2_coeffs_state_invalid,
+ bw_ls2_coeffs_state_init,
+ bw_ls2_coeffs_state_set_sample_rate,
+ bw_ls2_coeffs_state_reset_coeffs
+};
+#endif
+
struct bw_ls2_coeffs {
+#ifdef BW_DEBUG_DEEP
+ uint32_t hash;
+ enum bw_ls2_coeffs_state state;
+ uint32_t reset_id;
+#endif
+
// Sub-components
- bw_mm2_coeffs mm2_coeffs;
+ bw_mm2_coeffs mm2_coeffs;
// Coefficients
- float sg;
- float issg;
+ float sg;
+ float issg;
// Parameters
- float dc_gain;
- float cutoff;
- int param_changed;
+ float cutoff;
+ float prewarp_k;
+ float prewarp_freq;
+ float dc_gain;
+ int param_changed;
};
struct bw_ls2_state {
+#ifdef BW_DEBUG_DEEP
+ uint32_t hash;
+ uint32_t coeffs_reset_id;
+#endif
+
bw_mm2_state mm2_state;
};
-#define BW_LS2_PARAM_DC_GAIN 1
-#define BW_LS2_PARAM_CUTOFF (1<<1)
+#define BW_LS2_PARAM_CUTOFF 1
+#define BW_LS2_PARAM_DC_GAIN (1<<1)
+
+static inline void bw_ls2_init(
+ bw_ls2_coeffs * BW_RESTRICT coeffs) {
+ BW_ASSERT(coeffs != NULL);
-static inline void bw_ls2_init(bw_ls2_coeffs *BW_RESTRICT coeffs) {
bw_mm2_init(&coeffs->mm2_coeffs);
bw_mm2_set_prewarp_at_cutoff(&coeffs->mm2_coeffs, 0);
- coeffs->dc_gain = 1.f;
coeffs->cutoff = 1e3f;
+ coeffs->prewarp_k = 1.f;
+ coeffs->prewarp_freq = 1.f;
+ coeffs->dc_gain = 1.f;
+
+#ifdef BW_DEBUG_DEEP
+ coeffs->hash = bw_hash_sdbm("bw_ls2_coeffs");
+ coeffs->state = bw_ls2_coeffs_state_init;
+ coeffs->reset_id = coeffs->hash + 1;
+#endif
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state == bw_ls2_coeffs_state_init);
}
-static inline void bw_ls2_set_sample_rate(bw_ls2_coeffs *BW_RESTRICT coeffs, float sample_rate) {
+static inline void bw_ls2_set_sample_rate(
+ bw_ls2_coeffs * BW_RESTRICT coeffs,
+ float sample_rate) {
+ BW_ASSERT(coeffs != NULL);
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_init);
+ BW_ASSERT(bw_is_finite(sample_rate) && sample_rate > 0.f);
+
bw_mm2_set_sample_rate(&coeffs->mm2_coeffs, sample_rate);
+
+#ifdef BW_DEBUG_DEEP
+ coeffs->state = bw_ls2_coeffs_state_set_sample_rate;
+#endif
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state == bw_ls2_coeffs_state_set_sample_rate);
}
-static inline void bw_ls2_update_mm2_params(bw_ls2_coeffs *BW_RESTRICT coeffs) {
+static inline void bw_ls2_update_mm2_params(
+ bw_ls2_coeffs * BW_RESTRICT coeffs) {
+ bw_mm2_set_prewarp_freq(&coeffs->mm2_coeffs, coeffs->prewarp_freq + coeffs->prewarp_k * (coeffs->cutoff - coeffs->prewarp_freq));
if (coeffs->param_changed) {
if (coeffs->param_changed & BW_LS2_PARAM_DC_GAIN) {
coeffs->sg = bw_sqrtf(coeffs->dc_gain);
- coeffs->issg = bw_sqrtf(bw_rcpf(coeffs->sg));
+ coeffs->issg = bw_rcpf(bw_sqrtf(coeffs->sg));
bw_mm2_set_coeff_x(&coeffs->mm2_coeffs, coeffs->sg);
bw_mm2_set_coeff_lp(&coeffs->mm2_coeffs, coeffs->dc_gain - coeffs->sg);
bw_mm2_set_coeff_hp(&coeffs->mm2_coeffs, 1.f - coeffs->sg);
}
- if (coeffs->param_changed & BW_LS2_PARAM_CUTOFF)
- bw_mm2_set_prewarp_freq(&coeffs->mm2_coeffs, coeffs->cutoff);
bw_mm2_set_cutoff(&coeffs->mm2_coeffs, coeffs->cutoff * coeffs->issg);
coeffs->param_changed = 0;
}
}
-static inline void bw_ls2_reset_coeffs(bw_ls2_coeffs *BW_RESTRICT coeffs) {
+static inline void bw_ls2_reset_coeffs(
+ bw_ls2_coeffs * BW_RESTRICT coeffs) {
+ BW_ASSERT(coeffs != NULL);
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_set_sample_rate);
+
coeffs->param_changed = ~0;
bw_ls2_update_mm2_params(coeffs);
bw_mm2_reset_coeffs(&coeffs->mm2_coeffs);
+
+#ifdef BW_DEBUG_DEEP
+ coeffs->state = bw_ls2_coeffs_state_reset_coeffs;
+ coeffs->reset_id++;
+#endif
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state == bw_ls2_coeffs_state_reset_coeffs);
}
-static inline void bw_ls2_reset_state(const bw_ls2_coeffs *BW_RESTRICT coeffs, bw_ls2_state *BW_RESTRICT state, float x_0) {
- bw_mm2_reset_state(&coeffs->mm2_coeffs, &state->mm2_state, x_0);
+static inline float bw_ls2_reset_state(
+ const bw_ls2_coeffs * BW_RESTRICT coeffs,
+ bw_ls2_state * BW_RESTRICT state,
+ float x_0) {
+ BW_ASSERT(coeffs != NULL);
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_reset_coeffs);
+ BW_ASSERT(state != NULL);
+ BW_ASSERT(bw_is_finite(x_0));
+
+ const float y = bw_mm2_reset_state(&coeffs->mm2_coeffs, &state->mm2_state, x_0);
+
+#ifdef BW_DEBUG_DEEP
+ state->hash = bw_hash_sdbm("bw_ls2_state");
+ state->coeffs_reset_id = coeffs->reset_id;
+#endif
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_reset_coeffs);
+ BW_ASSERT_DEEP(bw_ls2_state_is_valid(coeffs, state));
+ BW_ASSERT(bw_is_finite(y));
+
+ return y;
}
-static inline void bw_ls2_update_coeffs_ctrl(bw_ls2_coeffs *BW_RESTRICT coeffs) {
+static inline void bw_ls2_reset_state_multi(
+ const bw_ls2_coeffs * BW_RESTRICT coeffs,
+ bw_ls2_state * BW_RESTRICT const * BW_RESTRICT state,
+ const float * x_0,
+ float * y_0,
+ size_t n_channels) {
+ BW_ASSERT(coeffs != NULL);
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_reset_coeffs);
+ BW_ASSERT(state != NULL);
+ BW_ASSERT(x_0 != NULL);
+
+ if (y_0 != NULL)
+ for (size_t i = 0; i < n_channels; i++)
+ y_0[i] = bw_ls2_reset_state(coeffs, state[i], x_0[i]);
+ else
+ for (size_t i = 0; i < n_channels; i++)
+ bw_ls2_reset_state(coeffs, state[i], x_0[i]);
+
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_reset_coeffs);
+ BW_ASSERT_DEEP(y_0 != NULL ? bw_has_only_finite(y_0, n_channels) : 1);
+}
+
+static inline void bw_ls2_update_coeffs_ctrl(
+ bw_ls2_coeffs * BW_RESTRICT coeffs) {
+ BW_ASSERT(coeffs != NULL);
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_reset_coeffs);
+ BW_ASSERT_DEEP(coeffs->cutoff * bw_rcpf(bw_sqrtf(bw_sqrtf(coeffs->dc_gain))) >= 1e-6f && coeffs->cutoff * bw_rcpf(bw_sqrtf(bw_sqrtf(coeffs->dc_gain))) <= 1e12f);
+
bw_ls2_update_mm2_params(coeffs);
bw_mm2_update_coeffs_ctrl(&coeffs->mm2_coeffs);
+
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_reset_coeffs);
}
-static inline void bw_ls2_update_coeffs_audio(bw_ls2_coeffs *BW_RESTRICT coeffs) {
+static inline void bw_ls2_update_coeffs_audio(
+ bw_ls2_coeffs * BW_RESTRICT coeffs) {
+ BW_ASSERT(coeffs != NULL);
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_reset_coeffs);
+ BW_ASSERT_DEEP(coeffs->cutoff * bw_rcpf(bw_sqrtf(bw_sqrtf(coeffs->dc_gain))) >= 1e-6f && coeffs->cutoff * bw_rcpf(bw_sqrtf(bw_sqrtf(coeffs->dc_gain))) <= 1e12f);
+
bw_mm2_update_coeffs_audio(&coeffs->mm2_coeffs);
+
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_reset_coeffs);
}
-static inline float bw_ls2_process1(const bw_ls2_coeffs *BW_RESTRICT coeffs, bw_ls2_state *BW_RESTRICT state, float x) {
- return bw_mm2_process1(&coeffs->mm2_coeffs, &state->mm2_state, x);
+static inline float bw_ls2_process1(
+ const bw_ls2_coeffs * BW_RESTRICT coeffs,
+ bw_ls2_state * BW_RESTRICT state,
+ float x) {
+ BW_ASSERT(coeffs != NULL);
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_reset_coeffs);
+ BW_ASSERT_DEEP(coeffs->cutoff * bw_rcpf(bw_sqrtf(bw_sqrtf(coeffs->dc_gain))) >= 1e-6f && coeffs->cutoff * bw_rcpf(bw_sqrtf(bw_sqrtf(coeffs->dc_gain))) <= 1e12f);
+ BW_ASSERT(state != NULL);
+ BW_ASSERT_DEEP(bw_ls2_state_is_valid(coeffs, state));
+ BW_ASSERT(bw_is_finite(x));
+
+ const float y = bw_mm2_process1(&coeffs->mm2_coeffs, &state->mm2_state, x);
+
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_reset_coeffs);
+ BW_ASSERT_DEEP(bw_ls2_state_is_valid(coeffs, state));
+ BW_ASSERT(bw_is_finite(y));
+
+ return y;
}
-static inline void bw_ls2_process(bw_ls2_coeffs *BW_RESTRICT coeffs, bw_ls2_state *BW_RESTRICT state, const float *x, float *y, size_t n_samples) {
+static inline void bw_ls2_process(
+ bw_ls2_coeffs * BW_RESTRICT coeffs,
+ bw_ls2_state * BW_RESTRICT state,
+ const float * x,
+ float * y,
+ size_t n_samples) {
+ BW_ASSERT(coeffs != NULL);
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_reset_coeffs);
+ BW_ASSERT_DEEP(coeffs->cutoff * bw_rcpf(bw_sqrtf(bw_sqrtf(coeffs->dc_gain))) >= 1e-6f && coeffs->cutoff * bw_rcpf(bw_sqrtf(bw_sqrtf(coeffs->dc_gain))) <= 1e12f);
+ BW_ASSERT(state != NULL);
+ BW_ASSERT_DEEP(bw_ls2_state_is_valid(coeffs, state));
+ BW_ASSERT(x != NULL);
+ BW_ASSERT_DEEP(bw_has_only_finite(x, n_samples));
+ BW_ASSERT(y != NULL);
+
bw_ls2_update_coeffs_ctrl(coeffs);
for (size_t i = 0; i < n_samples; i++) {
bw_ls2_update_coeffs_audio(coeffs);
y[i] = bw_ls2_process1(coeffs, state, x[i]);
}
+
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_reset_coeffs);
+ BW_ASSERT_DEEP(bw_ls2_state_is_valid(coeffs, state));
+ BW_ASSERT_DEEP(bw_has_only_finite(y, n_samples));
}
-static inline void bw_ls2_process_multi(bw_ls2_coeffs *BW_RESTRICT coeffs, bw_ls2_state *BW_RESTRICT const *BW_RESTRICT state, const float * const *x, float * const *y, size_t n_channels, size_t n_samples) {
+static inline void bw_ls2_process_multi(
+ bw_ls2_coeffs * BW_RESTRICT coeffs,
+ bw_ls2_state * BW_RESTRICT const * BW_RESTRICT state,
+ const float * const * x,
+ float * const * y,
+ size_t n_channels,
+ size_t n_samples) {
+ BW_ASSERT(coeffs != NULL);
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_reset_coeffs);
+ BW_ASSERT_DEEP(coeffs->cutoff * bw_rcpf(bw_sqrtf(bw_sqrtf(coeffs->dc_gain))) >= 1e-6f && coeffs->cutoff * bw_rcpf(bw_sqrtf(bw_sqrtf(coeffs->dc_gain))) <= 1e12f);
+ BW_ASSERT(state != NULL);
+ BW_ASSERT(x != NULL);
+ BW_ASSERT(y != NULL);
+
bw_ls2_update_coeffs_ctrl(coeffs);
for (size_t i = 0; i < n_samples; i++) {
bw_ls2_update_coeffs_audio(coeffs);
for (size_t j = 0; j < n_channels; j++)
y[j][i] = bw_ls2_process1(coeffs, state[j], x[j][i]);
}
+
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_reset_coeffs);
}
-static inline void bw_ls2_set_cutoff(bw_ls2_coeffs *BW_RESTRICT coeffs, float value) {
+static inline void bw_ls2_set_cutoff(
+ bw_ls2_coeffs * BW_RESTRICT coeffs,
+ float value) {
+ BW_ASSERT(coeffs != NULL);
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_init);
+ BW_ASSERT(bw_is_finite(value));
+ BW_ASSERT(value > 0.f);
+
if (coeffs->cutoff != value) {
coeffs->cutoff = value;
#pragma GCC diagnostic push
@@ -299,13 +616,59 @@ static inline void bw_ls2_set_cutoff(bw_ls2_coeffs *BW_RESTRICT coeffs, float va
coeffs->param_changed |= BW_LS2_PARAM_CUTOFF;
#pragma GCC diagnostic pop
}
+
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_init);
}
static inline void bw_ls2_set_Q(bw_ls2_coeffs *BW_RESTRICT coeffs, float value) {
+ BW_ASSERT(coeffs != NULL);
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_init);
+ BW_ASSERT(bw_is_finite(value));
+ BW_ASSERT(value >= 1e-6f && value <= 1e6f);
+
bw_mm2_set_Q(&coeffs->mm2_coeffs, value);
+
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_init);
+}
+
+static inline void bw_ls2_set_prewarp_at_cutoff(
+ bw_ls2_coeffs * BW_RESTRICT coeffs,
+ char value) {
+ BW_ASSERT(coeffs != NULL);
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_init);
+
+ bw_mm2_set_prewarp_at_cutoff(&coeffs->mm2_coeffs, value);
+
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_init);
+}
+
+static inline void bw_ls2_set_prewarp_freq(
+ bw_ls2_coeffs * BW_RESTRICT coeffs,
+ float value) {
+ BW_ASSERT(coeffs != NULL);
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_init);
+ BW_ASSERT(bw_is_finite(value));
+ BW_ASSERT(value >= 1e-6f && value <= 1e12f);
+
+ coeffs->prewarp_freq = value;
+
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_init);
}
static inline void bw_ls2_set_dc_gain_lin(bw_ls2_coeffs *BW_RESTRICT coeffs, float value) {
+ BW_ASSERT(coeffs != NULL);
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_init);
+ BW_ASSERT(bw_is_finite(value));
+ BW_ASSERT(value >= 1e-30f);
+
if (coeffs->dc_gain != value) {
coeffs->dc_gain = value;
#pragma GCC diagnostic push
@@ -313,14 +676,76 @@ static inline void bw_ls2_set_dc_gain_lin(bw_ls2_coeffs *BW_RESTRICT coeffs, flo
coeffs->param_changed |= BW_LS2_PARAM_DC_GAIN;
#pragma GCC diagnostic pop
}
+
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_init);
}
static inline void bw_ls2_set_dc_gain_dB(bw_ls2_coeffs *BW_RESTRICT coeffs, float value) {
+ BW_ASSERT(coeffs != NULL);
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_init);
+ BW_ASSERT(bw_is_finite(value));
+ BW_ASSERT(value >= -600.f);
+
bw_ls2_set_dc_gain_lin(coeffs, bw_dB2linf(value));
+
+ BW_ASSERT_DEEP(bw_ls2_coeffs_is_valid(coeffs));
+ BW_ASSERT_DEEP(coeffs->state >= bw_ls2_coeffs_state_init);
+}
+
+static inline char bw_ls2_coeffs_is_valid(
+ const bw_ls2_coeffs * BW_RESTRICT coeffs) {
+ BW_ASSERT(coeffs != NULL);
+
+#ifdef BW_DEBUG_DEEP
+ if (coeffs->hash != bw_hash_sdbm("bw_ls2_coeffs"))
+ return 0;
+ if (coeffs->state < bw_ls2_coeffs_state_init || coeffs->state > bw_ls2_coeffs_state_reset_coeffs)
+ return 0;
+#endif
+
+ if (!bw_is_finite(coeffs->cutoff) || coeffs->cutoff <= 0.f)
+ return 0;
+ if (coeffs->prewarp_k != 0.f && coeffs->prewarp_k != 1.f)
+ return 0;
+ if (coeffs->prewarp_freq < 1e-6f || coeffs->prewarp_freq > 1e12f)
+ return 0;
+ if (!bw_is_finite(coeffs->dc_gain) || coeffs->dc_gain < 1e-30f)
+ return 0;
+
+#ifdef BW_DEBUG_DEEP
+ if (coeffs->state >= bw_ls2_coeffs_state_reset_coeffs) {
+ if (!bw_is_finite(coeffs->sg) || coeffs->sg < 0.f)
+ return 0;
+ if (!bw_is_finite(coeffs->issg) || coeffs->issg < 0.f)
+ return 0;
+ }
+#endif
+
+ return bw_mm2_coeffs_is_valid(&coeffs->mm2_coeffs);
+}
+
+static inline char bw_ls2_state_is_valid(
+ const bw_ls2_coeffs * BW_RESTRICT coeffs,
+ const bw_ls2_state * BW_RESTRICT state) {
+ BW_ASSERT(state != NULL);
+
+#ifdef BW_DEBUG_DEEP
+ if (state->hash != bw_hash_sdbm("bw_ls2_state"))
+ return 0;
+
+ if (coeffs != NULL && coeffs->reset_id != state->coeffs_reset_id)
+ return 0;
+#endif
+
+ (void)coeffs;
+
+ return bw_mm2_state_is_valid(&coeffs->mm2_coeffs, &state->mm2_state);
}
-#undef BW_LS2_PARAM_DC_GAIN
#undef BW_LS2_PARAM_CUTOFF
+#undef BW_LS2_PARAM_DC_GAIN
#ifdef __cplusplus
}
@@ -339,21 +764,52 @@ class LS2 {
public:
LS2();
- void setSampleRate(float sampleRate);
- void reset(float x_0 = 0.f);
+ void setSampleRate(
+ float sampleRate);
+
+ void reset(
+ float x0 = 0.f,
+ float * BW_RESTRICT y0 = nullptr);
+
+ void reset(
+ float x0,
+ std::array * BW_RESTRICT y0);
+
+ void reset(
+ const float * x0,
+ float * y0 = nullptr);
+
+ void reset(
+ std::array x0,
+ std::array * BW_RESTRICT y0 = nullptr);
+
void process(
- const float * const *x,
- float * const *y,
- size_t nSamples);
+ const float * const * x,
+ float * const * y,
+ size_t nSamples);
+
void process(
std::array x,
- std::array y,
- size_t nSamples);
+ std::array y,
+ size_t nSamples);
- void setCutoff(float value);
- void setQ(float value);
- void setDcGainLin(float value);
- void setDcGainDB(float value);
+ void setCutoff(
+ float value);
+
+ void setQ(
+ float value);
+
+ void setPrewarpAtCutoff(
+ bool value);
+
+ void setPrewarpFreq(
+ float value);
+
+ void setDcGainLin(
+ float value);
+
+ void setDcGainDB(
+ float value);
/*! <<<...
* }
* ```
@@ -365,9 +821,9 @@ public:
* change at any time in future versions. Please, do not use it directly. */
private:
- bw_ls2_coeffs coeffs;
- bw_ls2_state states[N_CHANNELS];
- bw_ls2_state *BW_RESTRICT statesP[N_CHANNELS];
+ bw_ls2_coeffs coeffs;
+ bw_ls2_state states[N_CHANNELS];
+ bw_ls2_state * BW_RESTRICT statesP[N_CHANNELS];
};
template
@@ -378,50 +834,95 @@ inline LS2::LS2() {
}
template
-inline void LS2::setSampleRate(float sampleRate) {
+inline void LS2::setSampleRate(
+ float sampleRate) {
bw_ls2_set_sample_rate(&coeffs, sampleRate);
}
template
-inline void LS2::reset(float x_0) {
+inline void LS2::reset(
+ float x0,
+ float * BW_RESTRICT y0) {
bw_ls2_reset_coeffs(&coeffs);
- for (size_t i = 0; i < N_CHANNELS; i++)
- bw_ls2_reset_state(&coeffs, states + i, x_0);
+ if (y0 != nullptr)
+ for (size_t i = 0; i < N_CHANNELS; i++)
+ y0[i] = bw_ls2_reset_state(&coeffs, states + i, x0);
+ else
+ for (size_t i = 0; i < N_CHANNELS; i++)
+ bw_ls2_reset_state(&coeffs, states + i, x0);
+}
+
+template
+inline void LS2::reset(
+ float x0,
+ std::array * BW_RESTRICT y0) {
+ reset(x0, y0 != nullptr ? y0->data() : y0);
+}
+
+template
+inline void LS2::reset(
+ const float * x0,
+ float * y0) {
+ bw_ls2_reset_coeffs(&coeffs);
+ bw_ls2_reset_state_multi(&coeffs, statesP, x0, y0, N_CHANNELS);
+}
+
+template
+inline void LS2::reset(
+ std::array x0,
+ std::array * BW_RESTRICT y0) {
+ reset(x0.data(), y0 != nullptr ? y0->data() : nullptr);
}
template
inline void LS2::process(
- const float * const *x,
- float * const *y,
- size_t nSamples) {
+ const float * const * x,
+ float * const * y,
+ size_t nSamples) {
bw_ls2_process_multi(&coeffs, statesP, x, y, N_CHANNELS, nSamples);
}
template
inline void LS2::process(
std::array x,
- std::array y,
- size_t nSamples) {
+ std::array y,
+ size_t nSamples) {
process(x.data(), y.data(), nSamples);
}
template
-inline void LS2::setCutoff(float value) {
+inline void LS2::setCutoff(
+ float value) {
bw_ls2_set_cutoff(&coeffs, value);
}
template
-inline void LS2::setQ(float value) {
+inline void LS2::setQ(
+ float value) {
bw_ls2_set_Q(&coeffs, value);
}
template
-inline void LS2::setDcGainLin(float value) {
+inline void LS2::setPrewarpAtCutoff(
+ bool value) {
+ bw_ls2_set_prewarp_at_cutoff(&coeffs, value);
+}
+
+template
+inline void LS2::setPrewarpFreq(
+ float value) {
+ bw_ls2_set_prewarp_freq(&coeffs, value);
+}
+
+template
+inline void LS2::setDcGainLin(
+ float value) {
bw_ls2_set_dc_gain_lin(&coeffs, value);
}
template
-inline void LS2::setDcGainDB(float value) {
+inline void LS2::setDcGainDB(
+ float value) {
bw_ls2_set_dc_gain_dB(&coeffs, value);
}