make bw_svf super robust + fix bw_allpass1 + beginning of bw_allpass2
This commit is contained in:
Stefano D'Angelo
parent
03f3b8a67f
commit
7c941fa26b
@ -180,6 +180,7 @@ static inline float bw_allpass1_process1(const bw_allpass1_coeffs *BW_RESTRICT c
|
||||
}
|
||||
|
||||
static inline void bw_allpass1_process(bw_allpass1_coeffs *BW_RESTRICT coeffs, bw_allpass1_state *BW_RESTRICT state, const float *x, float *y, int n_samples) {
|
||||
bw_allpass1_update_coeffs_ctrl(coeffs);
|
||||
for (int i = 0; i < n_samples; i++)
|
||||
y[i] = bw_allpass1_process1(coeffs, state, x[i]);
|
||||
}
|
||||
|
||||
196
include/bw_allpass2.h
Normal file
196
include/bw_allpass2.h
Normal file
@ -0,0 +1,196 @@
|
||||
/*
|
||||
* Brickworks
|
||||
*
|
||||
* Copyright (C) 2022 Orastron Srl unipersonale
|
||||
*
|
||||
* Brickworks is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, version 3 of the License.
|
||||
*
|
||||
* Brickworks is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with Brickworks. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* File author: Stefano D'Angelo
|
||||
*/
|
||||
|
||||
/*!
|
||||
* module_type {{{ dsp }}}
|
||||
* version {{{ 0.3.0 }}}
|
||||
* requires {{{ bw_config bw_common bw_math }}}
|
||||
* description {{{
|
||||
* Second-order allpass filter.
|
||||
* }}}
|
||||
* changelog {{{
|
||||
* <ul>
|
||||
* <li>Version <strong>0.3.0</strong>:
|
||||
* <ul>
|
||||
* <li>First release.</li>
|
||||
* </ul>
|
||||
* </li>
|
||||
* </ul>
|
||||
* }}}
|
||||
*/
|
||||
|
||||
#ifndef _BW_ALLPASS2_H
|
||||
#define _BW_ALLPASS2_H
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
#include <bw_common.h>
|
||||
|
||||
/*! api {{{
|
||||
* #### bw_allpass2_coeffs
|
||||
* ```>>> */
|
||||
typedef struct _bw_allpass2_coeffs bw_allpass2_coeffs;
|
||||
/*! <<<```
|
||||
* Coefficients and related.
|
||||
*
|
||||
* #### bw_allpass2_state
|
||||
* ```>>> */
|
||||
typedef struct _bw_allpass2_state bw_allpass2_state;
|
||||
/*! <<<```
|
||||
* Internal state and related.
|
||||
*
|
||||
* #### bw_allpass2_init()
|
||||
* ```>>> */
|
||||
static inline void bw_allpass2_init(bw_allpass2_coeffs *BW_RESTRICT coeffs);
|
||||
/*! <<<```
|
||||
* Initializes input parameter values in `coeffs`.
|
||||
*
|
||||
* #### bw_allpass2_set_sample_rate()
|
||||
* ```>>> */
|
||||
static inline void bw_allpass2_set_sample_rate(bw_allpass2_coeffs *BW_RESTRICT coeffs, float sample_rate);
|
||||
/*! <<<```
|
||||
* Sets the `sample_rate` (Hz) value in `coeffs`.
|
||||
*
|
||||
* #### bw_allpass2_reset_coeffs()
|
||||
* ```>>> */
|
||||
static inline void bw_allpass2_reset_coeffs(bw_allpass2_coeffs *BW_RESTRICT coeffs);
|
||||
/*! <<<```
|
||||
* Resets coefficients in `coeffs` to assume their target values.
|
||||
*
|
||||
* #### bw_allpass2_reset_state()
|
||||
* ```>>> */
|
||||
static inline void bw_allpass2_reset_state(const bw_allpass2_coeffs *BW_RESTRICT coeffs, bw_allpass2_state *BW_RESTRICT state);
|
||||
/*! <<<```
|
||||
* Resets the given `state` to its initial values using the given `coeffs`.
|
||||
*
|
||||
* #### bw_allpass2_update_coeffs_ctrl()
|
||||
* ```>>> */
|
||||
static inline void bw_allpass2_update_coeffs_ctrl(bw_allpass2_coeffs *BW_RESTRICT coeffs);
|
||||
/*! <<<```
|
||||
* Triggers control-rate update of coefficients in `coeffs`.
|
||||
*
|
||||
* #### bw_allpass2_update_coeffs_audio()
|
||||
* ```>>> */
|
||||
static inline void bw_allpass2_update_coeffs_audio(bw_allpass2_coeffs *BW_RESTRICT coeffs);
|
||||
/*! <<<```
|
||||
* Triggers audio-rate update of coefficients in `coeffs`.
|
||||
*
|
||||
* #### bw_allpass2_process1()
|
||||
* ```>>> */
|
||||
static inline float bw_allpass2_process1(const bw_allpass2_coeffs *BW_RESTRICT coeffs, bw_allpass2_state *BW_RESTRICT state, float x);
|
||||
/*! <<<```
|
||||
* Processes one input sample `x` using `coeffs`, while using and updating
|
||||
* `state`. Returns the corresponding output sample.
|
||||
*
|
||||
* #### bw_allpass2_process()
|
||||
* ```>>> */
|
||||
static inline void bw_allpass2_process(bw_allpass2_coeffs *BW_RESTRICT coeffs, bw_allpass2_state *BW_RESTRICT state, const float *x, float *y, int 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
|
||||
* `coeffs` and `state` (control and audio rate).
|
||||
*
|
||||
* #### bw_allpass2_set_cutoff()
|
||||
* ```>>> */
|
||||
static inline void bw_allpass2_set_cutoff(bw_allpass2_coeffs *BW_RESTRICT coeffs, float value);
|
||||
/*! <<<```
|
||||
* Sets the cutoff frequency `value` (Hz) in `coeffs`.
|
||||
*
|
||||
* Default value: `1e3f`.
|
||||
* }}} */
|
||||
|
||||
/*** Implementation ***/
|
||||
|
||||
/* WARNING: This part of the file is not part of the public API. Its content may
|
||||
* change at any time in future versions. Please, do not use it directly. */
|
||||
|
||||
#include <bw_math.h>
|
||||
|
||||
struct _bw_allpass2_coeffs {
|
||||
// Coefficients
|
||||
float t_k;
|
||||
|
||||
float t;
|
||||
float X_k;
|
||||
|
||||
// Parameters
|
||||
float cutoff;
|
||||
float cutoff_prev;
|
||||
};
|
||||
|
||||
struct _bw_allpass2_state {
|
||||
float lp_z1;
|
||||
float X_z1;
|
||||
};
|
||||
|
||||
static inline void bw_allpass2_init(bw_allpass2_coeffs *BW_RESTRICT coeffs) {
|
||||
coeffs->cutoff = 1e3f;
|
||||
}
|
||||
|
||||
static inline void bw_allpass2_set_sample_rate(bw_allpass2_coeffs *BW_RESTRICT coeffs, float sample_rate) {
|
||||
coeffs->t_k = 3.141592653589793f / sample_rate;
|
||||
}
|
||||
|
||||
static inline void bw_allpass2_reset_coeffs(bw_allpass2_coeffs *BW_RESTRICT coeffs) {
|
||||
coeffs->cutoff_prev = -1.f;
|
||||
bw_allpass2_update_coeffs_ctrl(coeffs);
|
||||
}
|
||||
|
||||
static inline void bw_allpass2_reset_state(const bw_allpass2_coeffs *BW_RESTRICT coeffs, bw_allpass2_state *BW_RESTRICT state) {
|
||||
state->lp_z1 = 0.f;
|
||||
state->X_z1 = 0.f;
|
||||
}
|
||||
|
||||
static inline void bw_allpass2_update_coeffs_ctrl(bw_allpass2_coeffs *BW_RESTRICT coeffs) {
|
||||
if (coeffs->cutoff != coeffs->cutoff_prev) {
|
||||
coeffs->t = bw_tanf_3(coeffs->t_k * coeffs->cutoff);
|
||||
coeffs->X_k = bw_rcpf_2(1,f + coeffs->t);
|
||||
coeffs->cutoff_prev = coeffs->cutoff;
|
||||
}
|
||||
}
|
||||
|
||||
static inline void bw_allpass2_update_coeffs_audio(bw_allpass2_coeffs *BW_RESTRICT coeffs) {
|
||||
}
|
||||
|
||||
static inline float bw_allpass2_process1(const bw_allpass2_coeffs *BW_RESTRICT coeffs, bw_allpass2_state *BW_RESTRICT state, float x) {
|
||||
const float X = coeffs->X_k * (x - state->lp_z1 - coeffs->t * state->X_z1);
|
||||
const float lp = x - X;
|
||||
state->X_z1 = X;
|
||||
state->lp_z1 = lp;
|
||||
return lp + lp - x;
|
||||
}
|
||||
|
||||
static inline void bw_allpass2_process(bw_allpass2_coeffs *BW_RESTRICT coeffs, bw_allpass2_state *BW_RESTRICT state, const float *x, float *y, int n_samples) {
|
||||
bw_allpass2_update_coeffs_ctrl(coeffs);
|
||||
for (int i = 0; i < n_samples; i++)
|
||||
y[i] = bw_allpass2_process1(coeffs, state, x[i]);
|
||||
}
|
||||
|
||||
static inline void bw_allpass2_set_cutoff(bw_allpass2_coeffs *BW_RESTRICT coeffs, float value) {
|
||||
coeffs->cutoff = value;
|
||||
}
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@ -157,9 +157,9 @@ struct _bw_svf_coeffs {
|
||||
float t_k;
|
||||
|
||||
float t;
|
||||
float kf;
|
||||
float k;
|
||||
float hp_hp_z1;
|
||||
float hp_bp_z1;
|
||||
float kt;
|
||||
float hp_x;
|
||||
|
||||
// Parameters
|
||||
@ -171,6 +171,7 @@ struct _bw_svf_state {
|
||||
float hp_z1;
|
||||
float lp_z1;
|
||||
float bp_z1;
|
||||
float cutoff_z1;
|
||||
};
|
||||
|
||||
static inline void bw_svf_init(bw_svf_coeffs *BW_RESTRICT coeffs) {
|
||||
@ -196,15 +197,14 @@ static inline void _bw_svf_do_update_coeffs(bw_svf_coeffs *BW_RESTRICT coeffs, c
|
||||
if (cutoff_changed) {
|
||||
cutoff_cur = bw_one_pole_process1_sticky_rel(&coeffs->smooth_coeffs, &coeffs->smooth_cutoff_state, coeffs->cutoff);
|
||||
coeffs->t = bw_tanf_3(coeffs->t_k * cutoff_cur);
|
||||
coeffs->kf = coeffs->t * bw_rcpf_2(cutoff_cur);
|
||||
}
|
||||
if (Q_changed) {
|
||||
Q_cur = bw_one_pole_process1_sticky_abs(&coeffs->smooth_coeffs, &coeffs->smooth_Q_state, coeffs->Q);
|
||||
coeffs->k = bw_rcpf_2(Q_cur);
|
||||
}
|
||||
const float kpt = coeffs->k + coeffs->t;
|
||||
coeffs->hp_hp_z1 = coeffs->t * kpt;
|
||||
coeffs->hp_bp_z1 = coeffs->t + kpt;
|
||||
coeffs->hp_x = bw_rcpf_2(1.f + coeffs->hp_hp_z1);
|
||||
coeffs->kt = coeffs->k + coeffs->t;
|
||||
coeffs->hp_x = bw_rcpf_2(1.f + coeffs->t * coeffs->kt);
|
||||
}
|
||||
}
|
||||
|
||||
@ -218,6 +218,7 @@ static inline void bw_svf_reset_state(const bw_svf_coeffs *BW_RESTRICT coeffs, b
|
||||
state->hp_z1 = 0.f;
|
||||
state->lp_z1 = 0.f;
|
||||
state->bp_z1 = 0.f;
|
||||
state->cutoff_z1 = coeffs->cutoff;
|
||||
}
|
||||
|
||||
static inline void bw_svf_update_coeffs_ctrl(bw_svf_coeffs *BW_RESTRICT coeffs) {
|
||||
@ -228,13 +229,16 @@ static inline void bw_svf_update_coeffs_audio(bw_svf_coeffs *BW_RESTRICT coeffs)
|
||||
}
|
||||
|
||||
static inline void bw_svf_process1(const bw_svf_coeffs *BW_RESTRICT coeffs, bw_svf_state *BW_RESTRICT state, float x, float *y_lp, float *y_bp, float *y_hp) {
|
||||
*y_hp = coeffs->hp_x * (x - state->lp_z1 + coeffs->hp_bp_z1 * state->bp_z1 - coeffs->hp_hp_z1 * state->hp_z1);
|
||||
*y_bp = state->bp_z1 - coeffs->t * (*y_hp + state->hp_z1);
|
||||
*y_lp = state->lp_z1 - coeffs->t * (*y_bp + state->bp_z1);
|
||||
|
||||
const float kk = coeffs->kf * state->cutoff_z1;
|
||||
const float lp_xz1 = state->lp_z1 - kk * state->bp_z1;
|
||||
const float bp_xz1 = state->bp_z1 - kk * state->hp_z1;
|
||||
*y_hp = coeffs->hp_x * (x + coeffs->kt * bp_xz1 - lp_xz1);
|
||||
*y_bp = bp_xz1 - coeffs->t * *y_hp;
|
||||
*y_lp = lp_xz1 - coeffs->t * *y_bp;
|
||||
state->hp_z1 = *y_hp;
|
||||
state->lp_z1 = *y_lp;
|
||||
state->bp_z1 = *y_bp;
|
||||
state->cutoff_z1 = bw_one_pole_get_y_z1(&coeffs->smooth_cutoff_state);
|
||||
}
|
||||
|
||||
static inline void bw_svf_process(bw_svf_coeffs *BW_RESTRICT coeffs, bw_svf_state *BW_RESTRICT state, const float *x, float *y_lp, float *y_bp, float *y_hp, int n_samples) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user