orastron/brickworks
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

polished bw_{svf,wah} + removed bwpps + fixed examples

Browse Source
This commit is contained in:
Stefano D'Angelo 2023-08-13 11:55:25 +02:00
parent eb49fedd5e
commit 61c2b48817
13 changed files with 274 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
TODO
View File

@ -1,11 +1,6 @@
1.0.0 1.0.0
----- -----
in progress:
* merge c++ code into c headers
* revise typedef style (see https://stackoverflow.com/questions/54752861/using-an-anonymous-struct-vs-a-named-struct-with-typedef)
* var names xy -> x_y
* don't use reserved identifiers (https://devblogs.microsoft.com/oldnewthing/20230109-00/?p=107685)
code: code:
* debugging * debugging
* check all examples again * check all examples again

2
examples/fxpp_flanger/src/bw_example_fxpp_flanger.h
View File

@ -23,7 +23,7 @@
#include "platform.h" #include "platform.h"
#include <bwpp_chorus.h> #include <bw_chorus.h>
using namespace Brickworks; using namespace Brickworks;

2
examples/fxpp_mm1/src/bw_example_fxpp_mm1.h
View File

@ -23,7 +23,7 @@
#include "platform.h" #include "platform.h"
#include <bwpp_mm1.h> #include <bw_mm1.h>
using namespace Brickworks; using namespace Brickworks;

2
examples/fxpp_svf/src/bw_example_fxpp_svf.h
View File

@ -23,7 +23,7 @@
#include "platform.h" #include "platform.h"
#include <bwpp_svf.h> #include <bw_svf.h>
using namespace Brickworks; using namespace Brickworks;

2
examples/fxpp_vibrato/src/bw_example_fxpp_vibrato.h
View File

@ -23,7 +23,7 @@
#include "platform.h" #include "platform.h"
#include <bwpp_chorus.h> #include <bw_chorus.h>
using namespace Brickworks; using namespace Brickworks;

2
examples/fxpp_wah/src/bw_example_fxpp_wah.h
View File

@ -23,7 +23,7 @@
#include "platform.h" #include "platform.h"
#include <bwpp_wah.h> #include <bw_wah.h>
using namespace Brickworks; using namespace Brickworks;

2
examples/synthpp_mono/src/bw_example_synthpp_mono.h
View File

@ -31,7 +31,7 @@
#include <bw_osc_filt.h> #include <bw_osc_filt.h>
#include <bw_noise_gen.h> #include <bw_noise_gen.h>
#include <bw_pink_filt.h> #include <bw_pink_filt.h>
#include <bwpp_svf.h> #include <bw_svf.h>
#include <bw_env_gen.h> #include <bw_env_gen.h>
#include <bw_gain.h> #include <bw_gain.h>
#include <bw_ppm.h> #include <bw_ppm.h>

2
examples/synthpp_poly/src/bw_example_synthpp_poly.h
View File

@ -32,7 +32,7 @@
#include <bw_osc_filt.h> #include <bw_osc_filt.h>
#include <bw_noise_gen.h> #include <bw_noise_gen.h>
#include <bw_pink_filt.h> #include <bw_pink_filt.h>
#include <bwpp_svf.h> #include <bw_svf.h>
#include <bw_env_gen.h> #include <bw_env_gen.h>
#include <bw_gain.h> #include <bw_gain.h>
#include <bw_ppm.h> #include <bw_ppm.h>

2
examples/synthpp_simple/src/bw_example_synthpp_simple.h
View File

@ -26,7 +26,7 @@
#include <bw_phase_gen.h> #include <bw_phase_gen.h>
#include <bw_osc_pulse.h> #include <bw_osc_pulse.h>
#include <bw_osc_filt.h> #include <bw_osc_filt.h>
#include <bwpp_svf.h> #include <bw_svf.h>
#include <bw_env_gen.h> #include <bw_env_gen.h>
#include <bw_gain.h> #include <bw_gain.h>
#include <bw_ppm.h> #include <bw_ppm.h>

203
include/bw_svf.h
View File

@ -30,8 +30,15 @@
* <ul> * <ul>
* <li>Version <strong>1.0.0</strong>: * <li>Version <strong>1.0.0</strong>:
* <ul> * <ul>
* <li>Now using <code>size_t</code> instead of * <li><code>bw_svf_process()</code> and
* <code>BW_SIZE_T</code>.</li> * <code>bw_svf_process_multi()</code> now use <code>size_t</code>
* to count samples and channels.</li>
* <li>Added more <code>const</code> specifiers to input
* arguments.</li>
* <li>Moved C++ code to C header.</li>
* <li>Added overladed C++ <code>process()</code> function taking
* C-style arrays as arguments.</li>
* <li>Removed usage of reserved identifiers.</li>
* </ul> * </ul>
* </li> * </li>
* <li>Version <strong>0.6.0</strong>: * <li>Version <strong>0.6.0</strong>:
@ -79,8 +86,8 @@
* }}} * }}}
*/ */
#ifndef _BW_SVF_H #ifndef BW_SVF_H
#define _BW_SVF_H #define BW_SVF_H
#include <bw_common.h> #include <bw_common.h>
@ -91,13 +98,13 @@ extern "C" {
/*! api {{{ /*! api {{{
* #### bw_svf_coeffs * #### bw_svf_coeffs
* ```>>> */ * ```>>> */
typedef struct _bw_svf_coeffs bw_svf_coeffs; typedef struct bw_svf_coeffs bw_svf_coeffs;
/*! <<<``` /*! <<<```
* Coefficients and related. * Coefficients and related.
* *
* #### bw_svf_state * #### bw_svf_state
* ```>>> */ * ```>>> */
typedef struct _bw_svf_state bw_svf_state; typedef struct bw_svf_state bw_svf_state;
/*! <<<``` /*! <<<```
* Internal state and related. * Internal state and related.
* *
@ -121,10 +128,10 @@ static inline void bw_svf_reset_coeffs(bw_svf_coeffs *BW_RESTRICT coeffs);
* *
* #### bw_svf_reset_state() * #### bw_svf_reset_state()
* ```>>> */ * ```>>> */
static inline void bw_svf_reset_state(const bw_svf_coeffs *BW_RESTRICT coeffs, bw_svf_state *BW_RESTRICT state, float x0); static inline void bw_svf_reset_state(const bw_svf_coeffs *BW_RESTRICT coeffs, bw_svf_state *BW_RESTRICT state, float x_0);
/*! <<<``` /*! <<<```
* Resets the given `state` to its initial values using the given `coeffs` * Resets the given `state` to its initial values using the given `coeffs`
* and the quiescent/initial input value `x0`. * and the quiescent/initial input value `x_0`.
* *
* #### bw_svf_update_coeffs_ctrl() * #### bw_svf_update_coeffs_ctrl()
* ```>>> */ * ```>>> */
@ -148,7 +155,7 @@ static inline void bw_svf_process1(const bw_svf_coeffs *BW_RESTRICT coeffs, bw_s
* *
* #### bw_svf_process() * #### bw_svf_process()
* ```>>> */ * ```>>> */
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); 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, size_t n_samples);
/*! <<<``` /*! <<<```
* Processes the first `n_samples` of the input buffer `x` and fills the * Processes the first `n_samples` of the input buffer `x` and fills the
* first `n_samples` of the output buffers `y_lp` (lowpass), `y_bp` * first `n_samples` of the output buffers `y_lp` (lowpass), `y_bp`
@ -157,7 +164,7 @@ static inline void bw_svf_process(bw_svf_coeffs *BW_RESTRICT coeffs, bw_svf_stat
* *
* #### bw_svf_process_multi() * #### bw_svf_process_multi()
* ```>>> */ * ```>>> */
static inline void bw_svf_process_multi(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_channels, int n_samples); static inline void bw_svf_process_multi(bw_svf_coeffs *BW_RESTRICT coeffs, bw_svf_state * const *BW_RESTRICT state, const float * const *x, float **y_lp, float **y_bp, float **y_hp, size_t n_channels, size_t n_samples);
/*! <<<``` /*! <<<```
* Processes the first `n_samples` of the `n_channels` input buffers `x` and * 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_lp` * fills the first `n_samples` of the `n_channels` output buffers `y_lp`
@ -224,7 +231,7 @@ static inline void bw_svf_set_prewarp_freq(bw_svf_coeffs *BW_RESTRICT coeffs, fl
extern "C" { extern "C" {
#endif #endif
struct _bw_svf_coeffs { struct bw_svf_coeffs {
// Sub-components // Sub-components
bw_one_pole_coeffs smooth_coeffs; bw_one_pole_coeffs smooth_coeffs;
bw_one_pole_state smooth_cutoff_state; bw_one_pole_state smooth_cutoff_state;
@ -248,7 +255,7 @@ struct _bw_svf_coeffs {
float prewarp_freq; float prewarp_freq;
}; };
struct _bw_svf_state { struct bw_svf_state {
float hp_z1; float hp_z1;
float lp_z1; float lp_z1;
float bp_z1; float bp_z1;
@ -271,7 +278,7 @@ static inline void bw_svf_set_sample_rate(bw_svf_coeffs *BW_RESTRICT coeffs, flo
coeffs->t_k = 3.141592653589793f / sample_rate; coeffs->t_k = 3.141592653589793f / sample_rate;
} }
static inline void _bw_svf_do_update_coeffs(bw_svf_coeffs *BW_RESTRICT coeffs, char force) { static inline void bw_svf_do_update_coeffs(bw_svf_coeffs *BW_RESTRICT coeffs, char force) {
const float prewarp_freq = coeffs->prewarp_freq + coeffs->prewarp_k * (coeffs->cutoff - coeffs->prewarp_freq); const float prewarp_freq = coeffs->prewarp_freq + coeffs->prewarp_k * (coeffs->cutoff - coeffs->prewarp_freq);
float cutoff_cur = bw_one_pole_get_y_z1(&coeffs->smooth_cutoff_state); float cutoff_cur = bw_one_pole_get_y_z1(&coeffs->smooth_cutoff_state);
float prewarp_freq_cur = bw_one_pole_get_y_z1(&coeffs->smooth_prewarp_freq_state); float prewarp_freq_cur = bw_one_pole_get_y_z1(&coeffs->smooth_prewarp_freq_state);
@ -303,12 +310,12 @@ static inline void bw_svf_reset_coeffs(bw_svf_coeffs *BW_RESTRICT coeffs) {
bw_one_pole_reset_state(&coeffs->smooth_coeffs, &coeffs->smooth_cutoff_state, coeffs->cutoff); bw_one_pole_reset_state(&coeffs->smooth_coeffs, &coeffs->smooth_cutoff_state, coeffs->cutoff);
bw_one_pole_reset_state(&coeffs->smooth_coeffs, &coeffs->smooth_Q_state, coeffs->Q); bw_one_pole_reset_state(&coeffs->smooth_coeffs, &coeffs->smooth_Q_state, coeffs->Q);
bw_one_pole_reset_state(&coeffs->smooth_coeffs, &coeffs->smooth_prewarp_freq_state, coeffs->prewarp_freq + coeffs->prewarp_k * (coeffs->cutoff - coeffs->prewarp_freq)); bw_one_pole_reset_state(&coeffs->smooth_coeffs, &coeffs->smooth_prewarp_freq_state, coeffs->prewarp_freq + coeffs->prewarp_k * (coeffs->cutoff - coeffs->prewarp_freq));
_bw_svf_do_update_coeffs(coeffs, 1); bw_svf_do_update_coeffs(coeffs, 1);
} }
static inline void bw_svf_reset_state(const bw_svf_coeffs *BW_RESTRICT coeffs, bw_svf_state *BW_RESTRICT state, float x0) { static inline void bw_svf_reset_state(const bw_svf_coeffs *BW_RESTRICT coeffs, bw_svf_state *BW_RESTRICT state, float x_0) {
state->hp_z1 = 0.f; state->hp_z1 = 0.f;
state->lp_z1 = x0; state->lp_z1 = x_0;
state->bp_z1 = 0.f; state->bp_z1 = 0.f;
state->cutoff_z1 = coeffs->cutoff; state->cutoff_z1 = coeffs->cutoff;
} }
@ -318,7 +325,7 @@ static inline void bw_svf_update_coeffs_ctrl(bw_svf_coeffs *BW_RESTRICT coeffs)
} }
static inline void bw_svf_update_coeffs_audio(bw_svf_coeffs *BW_RESTRICT coeffs) { static inline void bw_svf_update_coeffs_audio(bw_svf_coeffs *BW_RESTRICT coeffs) {
_bw_svf_do_update_coeffs(coeffs, 0); bw_svf_do_update_coeffs(coeffs, 0);
} }
static inline void bw_svf_process1(const bw_svf_coeffs *BW_RESTRICT coeffs, bw_svf_state *BW_RESTRICT state, float x, float *BW_RESTRICT y_lp, float *BW_RESTRICT y_bp, float *BW_RESTRICT y_hp) { static inline void bw_svf_process1(const bw_svf_coeffs *BW_RESTRICT coeffs, bw_svf_state *BW_RESTRICT state, float x, float *BW_RESTRICT y_lp, float *BW_RESTRICT y_bp, float *BW_RESTRICT y_hp) {
@ -334,16 +341,16 @@ static inline void bw_svf_process1(const bw_svf_coeffs *BW_RESTRICT coeffs, bw_s
state->cutoff_z1 = bw_one_pole_get_y_z1(&coeffs->smooth_cutoff_state); 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) { 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, size_t n_samples) {
if (y_lp != NULL) { if (y_lp != NULL) {
if (y_bp != NULL) { if (y_bp != NULL) {
if (y_hp != NULL) { if (y_hp != NULL) {
for (int i = 0; i < n_samples; i++) { for (size_t i = 0; i < n_samples; i++) {
bw_svf_update_coeffs_audio(coeffs); bw_svf_update_coeffs_audio(coeffs);
bw_svf_process1(coeffs, state, x[i], y_lp + i, y_bp + i, y_hp + i); bw_svf_process1(coeffs, state, x[i], y_lp + i, y_bp + i, y_hp + i);
} }
} else { } else {
for (int i = 0; i < n_samples; i++) { for (size_t i = 0; i < n_samples; i++) {
bw_svf_update_coeffs_audio(coeffs); bw_svf_update_coeffs_audio(coeffs);
float v_hp; float v_hp;
bw_svf_process1(coeffs, state, x[i], y_lp + i, y_bp + i, &v_hp); bw_svf_process1(coeffs, state, x[i], y_lp + i, y_bp + i, &v_hp);
@ -351,13 +358,13 @@ static inline void bw_svf_process(bw_svf_coeffs *BW_RESTRICT coeffs, bw_svf_stat
} }
} else { } else {
if (y_hp != NULL) { if (y_hp != NULL) {
for (int i = 0; i < n_samples; i++) { for (size_t i = 0; i < n_samples; i++) {
bw_svf_update_coeffs_audio(coeffs); bw_svf_update_coeffs_audio(coeffs);
float v_bp; float v_bp;
bw_svf_process1(coeffs, state, x[i], y_lp + i, &v_bp, y_hp + i); bw_svf_process1(coeffs, state, x[i], y_lp + i, &v_bp, y_hp + i);
} }
} else { } else {
for (int i = 0; i < n_samples; i++) { for (size_t i = 0; i < n_samples; i++) {
bw_svf_update_coeffs_audio(coeffs); bw_svf_update_coeffs_audio(coeffs);
float v_bp, v_hp; float v_bp, v_hp;
bw_svf_process1(coeffs, state, x[i], y_lp + i, &v_bp, &v_hp); bw_svf_process1(coeffs, state, x[i], y_lp + i, &v_bp, &v_hp);
@ -367,13 +374,13 @@ static inline void bw_svf_process(bw_svf_coeffs *BW_RESTRICT coeffs, bw_svf_stat
} else { } else {
if (y_bp != NULL) { if (y_bp != NULL) {
if (y_hp != NULL) { if (y_hp != NULL) {
for (int i = 0; i < n_samples; i++) { for (size_t i = 0; i < n_samples; i++) {
bw_svf_update_coeffs_audio(coeffs); bw_svf_update_coeffs_audio(coeffs);
float v_lp; float v_lp;
bw_svf_process1(coeffs, state, x[i], &v_lp, y_bp + i, y_hp + i); bw_svf_process1(coeffs, state, x[i], &v_lp, y_bp + i, y_hp + i);
} }
} else { } else {
for (int i = 0; i < n_samples; i++) { for (size_t i = 0; i < n_samples; i++) {
bw_svf_update_coeffs_audio(coeffs); bw_svf_update_coeffs_audio(coeffs);
float v_lp, v_hp; float v_lp, v_hp;
bw_svf_process1(coeffs, state, x[i], &v_lp, y_bp + i, &v_hp); bw_svf_process1(coeffs, state, x[i], &v_lp, y_bp + i, &v_hp);
@ -381,13 +388,13 @@ static inline void bw_svf_process(bw_svf_coeffs *BW_RESTRICT coeffs, bw_svf_stat
} }
} else { } else {
if (y_hp != NULL) { if (y_hp != NULL) {
for (int i = 0; i < n_samples; i++) { for (size_t i = 0; i < n_samples; i++) {
bw_svf_update_coeffs_audio(coeffs); bw_svf_update_coeffs_audio(coeffs);
float v_lp, v_bp; float v_lp, v_bp;
bw_svf_process1(coeffs, state, x[i], &v_lp, &v_bp, y_hp + i); bw_svf_process1(coeffs, state, x[i], &v_lp, &v_bp, y_hp + i);
} }
} else { } else {
for (int i = 0; i < n_samples; i++) { for (size_t i = 0; i < n_samples; i++) {
bw_svf_update_coeffs_audio(coeffs); bw_svf_update_coeffs_audio(coeffs);
float v_lp, v_bp, v_hp; float v_lp, v_bp, v_hp;
bw_svf_process1(coeffs, state, x[i], &v_lp, &v_bp, &v_hp); bw_svf_process1(coeffs, state, x[i], &v_lp, &v_bp, &v_hp);
@ -397,13 +404,13 @@ static inline void bw_svf_process(bw_svf_coeffs *BW_RESTRICT coeffs, bw_svf_stat
} }
} }
static inline void bw_svf_process_multi(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_channels, int n_samples) { static inline void bw_svf_process_multi(bw_svf_coeffs *BW_RESTRICT coeffs, bw_svf_state * const *BW_RESTRICT state, const float * const *x, float **y_lp, float **y_bp, float **y_hp, size_t n_channels, size_t n_samples) {
if (y_lp != NULL) { if (y_lp != NULL) {
if (y_bp != NULL) { if (y_bp != NULL) {
if (y_hp != NULL) { if (y_hp != NULL) {
for (int i = 0; i < n_samples; i++) { for (size_t i = 0; i < n_samples; i++) {
bw_svf_update_coeffs_audio(coeffs); bw_svf_update_coeffs_audio(coeffs);
for (int j = 0; j < n_channels; j++) { for (size_t j = 0; j < n_channels; j++) {
float v_lp, v_bp, v_hp; float v_lp, v_bp, v_hp;
bw_svf_process1(coeffs, state[j], x[j][i], &v_lp, &v_bp, &v_hp); bw_svf_process1(coeffs, state[j], x[j][i], &v_lp, &v_bp, &v_hp);
if (y_lp[j]) if (y_lp[j])
@ -415,9 +422,9 @@ static inline void bw_svf_process_multi(bw_svf_coeffs *BW_RESTRICT coeffs, bw_sv
} }
} }
} else { } else {
for (int i = 0; i < n_samples; i++) { for (size_t i = 0; i < n_samples; i++) {
bw_svf_update_coeffs_audio(coeffs); bw_svf_update_coeffs_audio(coeffs);
for (int j = 0; j < n_channels; j++) { for (size_t j = 0; j < n_channels; j++) {
float v_lp, v_bp, v_hp; float v_lp, v_bp, v_hp;
bw_svf_process1(coeffs, state[j], x[j][i], &v_lp, &v_bp, &v_hp); bw_svf_process1(coeffs, state[j], x[j][i], &v_lp, &v_bp, &v_hp);
if (y_lp[j]) if (y_lp[j])
@ -429,9 +436,9 @@ static inline void bw_svf_process_multi(bw_svf_coeffs *BW_RESTRICT coeffs, bw_sv
} }
} else { } else {
if (y_hp != NULL) { if (y_hp != NULL) {
for (int i = 0; i < n_samples; i++) { for (size_t i = 0; i < n_samples; i++) {
bw_svf_update_coeffs_audio(coeffs); bw_svf_update_coeffs_audio(coeffs);
for (int j = 0; j < n_channels; j++) { for (size_t j = 0; j < n_channels; j++) {
float v_lp, v_bp, v_hp; float v_lp, v_bp, v_hp;
bw_svf_process1(coeffs, state[j], x[j][i], &v_lp, &v_bp, &v_hp); bw_svf_process1(coeffs, state[j], x[j][i], &v_lp, &v_bp, &v_hp);
if (y_lp[j]) if (y_lp[j])
@ -441,9 +448,9 @@ static inline void bw_svf_process_multi(bw_svf_coeffs *BW_RESTRICT coeffs, bw_sv
} }
} }
} else { } else {
for (int i = 0; i < n_samples; i++) { for (size_t i = 0; i < n_samples; i++) {
bw_svf_update_coeffs_audio(coeffs); bw_svf_update_coeffs_audio(coeffs);
for (int j = 0; j < n_channels; j++) { for (size_t j = 0; j < n_channels; j++) {
float v_lp, v_bp, v_hp; float v_lp, v_bp, v_hp;
bw_svf_process1(coeffs, state[j], x[j][i], &v_lp, &v_bp, &v_hp); bw_svf_process1(coeffs, state[j], x[j][i], &v_lp, &v_bp, &v_hp);
if (y_lp[j]) if (y_lp[j])
@ -455,9 +462,9 @@ static inline void bw_svf_process_multi(bw_svf_coeffs *BW_RESTRICT coeffs, bw_sv
} else { } else {
if (y_bp != NULL) { if (y_bp != NULL) {
if (y_hp != NULL) { if (y_hp != NULL) {
for (int i = 0; i < n_samples; i++) { for (size_t i = 0; i < n_samples; i++) {
bw_svf_update_coeffs_audio(coeffs); bw_svf_update_coeffs_audio(coeffs);
for (int j = 0; j < n_channels; j++) { for (size_t j = 0; j < n_channels; j++) {
float v_lp, v_bp, v_hp; float v_lp, v_bp, v_hp;
bw_svf_process1(coeffs, state[j], x[j][i], &v_lp, &v_bp, &v_hp); bw_svf_process1(coeffs, state[j], x[j][i], &v_lp, &v_bp, &v_hp);
if (y_bp[j]) if (y_bp[j])
@ -467,9 +474,9 @@ static inline void bw_svf_process_multi(bw_svf_coeffs *BW_RESTRICT coeffs, bw_sv
} }
} }
} else { } else {
for (int i = 0; i < n_samples; i++) { for (size_t i = 0; i < n_samples; i++) {
bw_svf_update_coeffs_audio(coeffs); bw_svf_update_coeffs_audio(coeffs);
for (int j = 0; j < n_channels; j++) { for (size_t j = 0; j < n_channels; j++) {
float v_lp, v_bp, v_hp; float v_lp, v_bp, v_hp;
bw_svf_process1(coeffs, state[j], x[j][i], &v_lp, &v_bp, &v_hp); bw_svf_process1(coeffs, state[j], x[j][i], &v_lp, &v_bp, &v_hp);
if (y_bp[j]) if (y_bp[j])
@ -479,9 +486,9 @@ static inline void bw_svf_process_multi(bw_svf_coeffs *BW_RESTRICT coeffs, bw_sv
} }
} else { } else {
if (y_hp != NULL) { if (y_hp != NULL) {
for (int i = 0; i < n_samples; i++) { for (size_t i = 0; i < n_samples; i++) {
bw_svf_update_coeffs_audio(coeffs); bw_svf_update_coeffs_audio(coeffs);
for (int j = 0; j < n_channels; j++) { for (size_t j = 0; j < n_channels; j++) {
float v_lp, v_bp, v_hp; float v_lp, v_bp, v_hp;
bw_svf_process1(coeffs, state[j], x[j][i], &v_lp, &v_bp, &v_hp); bw_svf_process1(coeffs, state[j], x[j][i], &v_lp, &v_bp, &v_hp);
if (y_hp[j]) if (y_hp[j])
@ -489,9 +496,9 @@ static inline void bw_svf_process_multi(bw_svf_coeffs *BW_RESTRICT coeffs, bw_sv
} }
} }
} else { } else {
for (int i = 0; i < n_samples; i++) { for (size_t i = 0; i < n_samples; i++) {
bw_svf_update_coeffs_audio(coeffs); bw_svf_update_coeffs_audio(coeffs);
for (int j = 0; j < n_channels; j++) { for (size_t j = 0; j < n_channels; j++) {
float v_lp, v_bp, v_hp; float v_lp, v_bp, v_hp;
bw_svf_process1(coeffs, state[j], x[j][i], &v_lp, &v_bp, &v_hp); bw_svf_process1(coeffs, state[j], x[j][i], &v_lp, &v_bp, &v_hp);
} }
@ -518,6 +525,116 @@ static inline void bw_svf_set_prewarp_freq(bw_svf_coeffs *BW_RESTRICT coeffs, fl
} }
#ifdef __cplusplus #ifdef __cplusplus
}
#include <array>
namespace Brickworks {
/*** Public C++ API ***/
/*! api_cpp {{{
* ##### Brickworks::SVF
* ```>>> */
template<size_t N_CHANNELS>
class SVF {
public:
SVF();
void setSampleRate(float sampleRate);
void reset(float x_0 = 0.f);
void process(
const float * const *x,
float **y_lp,
float **y_bp,
float **y_hp,
size_t nSamples);
void process(
std::array<const float *, N_CHANNELS> x,
std::array<float *, N_CHANNELS> y_lp,
std::array<float *, N_CHANNELS> y_bp,
std::array<float *, N_CHANNELS> y_hp,
size_t nSamples);
void setCutoff(float value);
void setQ(float value);
void setPrewarpAtCutoff(bool value);
void setPrewarpFreq(float value);
/*! <<<...
* }
* ```
* }}} */
/*** 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. */
private:
bw_svf_coeffs coeffs;
bw_svf_state states[N_CHANNELS];
bw_svf_state *statesP[N_CHANNELS];
};
template<size_t N_CHANNELS>
inline SVF<N_CHANNELS>::SVF() {
bw_svf_init(&coeffs);
for (size_t i = 0; i < N_CHANNELS; i++)
statesP[i] = states + i;
}
template<size_t N_CHANNELS>
inline void SVF<N_CHANNELS>::setSampleRate(float sampleRate) {
bw_svf_set_sample_rate(&coeffs, sampleRate);
}
template<size_t N_CHANNELS>
inline void SVF<N_CHANNELS>::reset(float x_0) {
bw_svf_reset_coeffs(&coeffs);
for (size_t i = 0; i < N_CHANNELS; i++)
bw_svf_reset_state(&coeffs, states + i, x_0);
}
template<size_t N_CHANNELS>
inline void SVF<N_CHANNELS>::process(
const float * const *x,
float **y_lp,
float **y_bp,
float **y_hp,
size_t nSamples) {
bw_svf_process_multi(&coeffs, statesP, x, y_lp, y_bp, y_hp, N_CHANNELS, nSamples);
}
template<size_t N_CHANNELS>
inline void SVF<N_CHANNELS>::process(
std::array<const float *, N_CHANNELS> x,
std::array<float *, N_CHANNELS> y_lp,
std::array<float *, N_CHANNELS> y_bp,
std::array<float *, N_CHANNELS> y_hp,
size_t nSamples) {
process(x.data(), y_lp.data(), y_bp.data(), y_hp.data(), nSamples);
}
template<size_t N_CHANNELS>
inline void SVF<N_CHANNELS>::setCutoff(float value) {
bw_svf_set_cutoff(&coeffs, value);
}
template<size_t N_CHANNELS>
inline void SVF<N_CHANNELS>::setQ(float value) {
bw_svf_set_Q(&coeffs, value);
}
template<size_t N_CHANNELS>
inline void SVF<N_CHANNELS>::setPrewarpAtCutoff(bool value) {
bw_svf_set_prewarp_at_cutoff(&coeffs, value);
}
template<size_t N_CHANNELS>
inline void SVF<N_CHANNELS>::setPrewarpFreq(float value) {
bw_svf_set_prewarp_freq(&coeffs, value);
}
} }
#endif #endif

121
include/bw_wah.h
View File

@ -31,8 +31,15 @@
* <ul> * <ul>
* <li>Version <strong>1.0.0</strong>: * <li>Version <strong>1.0.0</strong>:
* <ul> * <ul>
* <li>Now using <code>size_t</code> instead of * <li><code>bw_wah_process()</code> and
* <code>BW_SIZE_T</code>.</li> * <code>bw_wah_process_multi()</code> now use <code>size_t</code>
* to count samples and channels.</li>
* <li>Added more <code>const</code> specifiers to input
* arguments.</li>
* <li>Moved C++ code to C header.</li>
* <li>Added overladed C++ <code>process()</code> function taking
* C-style arrays as arguments.</li>
* <li>Removed usage of reserved identifiers.</li>
* </ul> * </ul>
* </li> * </li>
* <li>Version <strong>0.6.0</strong>: * <li>Version <strong>0.6.0</strong>:
@ -69,8 +76,8 @@
* }}} * }}}
*/ */
#ifndef _BW_WAH_H #ifndef BW_WAH_H
#define _BW_WAH_H #define BW_WAH_H
#include <bw_common.h> #include <bw_common.h>
@ -81,13 +88,13 @@ extern "C" {
/*! api {{{ /*! api {{{
* #### bw_wah_coeffs * #### bw_wah_coeffs
* ```>>> */ * ```>>> */
typedef struct _bw_wah_coeffs bw_wah_coeffs; typedef struct bw_wah_coeffs bw_wah_coeffs;
/*! <<<``` /*! <<<```
* Coefficients and related. * Coefficients and related.
* *
* #### bw_wah_state * #### bw_wah_state
* ```>>> */ * ```>>> */
typedef struct _bw_wah_state bw_wah_state; typedef struct bw_wah_state bw_wah_state;
/*! <<<``` /*! <<<```
* Internal state and related. * Internal state and related.
* *
@ -136,7 +143,7 @@ static inline float bw_wah_process1(const bw_wah_coeffs *BW_RESTRICT coeffs, bw_
* *
* #### bw_wah_process() * #### bw_wah_process()
* ```>>> */ * ```>>> */
static inline void bw_wah_process(bw_wah_coeffs *BW_RESTRICT coeffs, bw_wah_state *BW_RESTRICT state, const float *x, float *y, int n_samples); static inline void bw_wah_process(bw_wah_coeffs *BW_RESTRICT coeffs, bw_wah_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 * 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 * first `n_samples` of the output buffer `y`, while using and updating both
@ -144,7 +151,7 @@ static inline void bw_wah_process(bw_wah_coeffs *BW_RESTRICT coeffs, bw_wah_stat
* *
* #### bw_wah_process_multi() * #### bw_wah_process_multi()
* ```>>> */ * ```>>> */
static inline void bw_wah_process_multi(bw_wah_coeffs *BW_RESTRICT coeffs, bw_wah_state **BW_RESTRICT state, const float **x, float **y, int n_channels, int n_samples); static inline void bw_wah_process_multi(bw_wah_coeffs *BW_RESTRICT coeffs, bw_wah_state * const *BW_RESTRICT state, const float * const *x, float **y, size_t n_channels, size_t n_samples);
/*! <<<``` /*! <<<```
* Processes the first `n_samples` of the `n_channels` input buffers `x` and * 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 * fills the first `n_samples` of the `n_channels` output buffers `y`, while
@ -176,12 +183,12 @@ static inline void bw_wah_set_wah(bw_wah_coeffs *BW_RESTRICT coeffs, float value
extern "C" { extern "C" {
#endif #endif
struct _bw_wah_coeffs { struct bw_wah_coeffs {
// Sub-components // Sub-components
bw_svf_coeffs svf_coeffs; bw_svf_coeffs svf_coeffs;
}; };
struct _bw_wah_state { struct bw_wah_state {
// Sub-components // Sub-components
bw_svf_state svf_state; bw_svf_state svf_state;
}; };
@ -218,19 +225,19 @@ static inline float bw_wah_process1(const bw_wah_coeffs *BW_RESTRICT coeffs, bw_
return v_bp; return v_bp;
} }
static inline void bw_wah_process(bw_wah_coeffs *BW_RESTRICT coeffs, bw_wah_state *BW_RESTRICT state, const float *x, float *y, int n_samples) { static inline void bw_wah_process(bw_wah_coeffs *BW_RESTRICT coeffs, bw_wah_state *BW_RESTRICT state, const float *x, float *y, size_t n_samples) {
bw_wah_update_coeffs_ctrl(coeffs); bw_wah_update_coeffs_ctrl(coeffs);
for (int i = 0; i < n_samples; i++) { for (size_t i = 0; i < n_samples; i++) {
bw_wah_update_coeffs_audio(coeffs); bw_wah_update_coeffs_audio(coeffs);
y[i] = bw_wah_process1(coeffs, state, x[i]); y[i] = bw_wah_process1(coeffs, state, x[i]);
} }
} }
static inline void bw_wah_process_multi(bw_wah_coeffs *BW_RESTRICT coeffs, bw_wah_state **BW_RESTRICT state, const float **x, float **y, int n_channels, int n_samples) { static inline void bw_wah_process_multi(bw_wah_coeffs *BW_RESTRICT coeffs, bw_wah_state * const *BW_RESTRICT state, const float * const *x, float **y, size_t n_channels, size_t n_samples) {
bw_wah_update_coeffs_ctrl(coeffs); bw_wah_update_coeffs_ctrl(coeffs);
for (int i = 0; i < n_samples; i++) { for (size_t i = 0; i < n_samples; i++) {
bw_wah_update_coeffs_audio(coeffs); bw_wah_update_coeffs_audio(coeffs);
for (int j = 0; j < n_channels; j++) for (size_t j = 0; j < n_channels; j++)
y[j][i] = bw_wah_process1(coeffs, state[j], x[j][i]); y[j][i] = bw_wah_process1(coeffs, state[j], x[j][i]);
} }
} }
@ -240,6 +247,90 @@ static inline void bw_wah_set_wah(bw_wah_coeffs *BW_RESTRICT coeffs, float value
} }
#ifdef __cplusplus #ifdef __cplusplus
}
#include <array>
namespace Brickworks {
/*** Public C++ API ***/
/*! api_cpp {{{
* ##### Brickworks::Wah
* ```>>> */
template<size_t N_CHANNELS>
class Wah {
public:
Wah();
void setSampleRate(float sampleRate);
void reset();
void process(
const float * const *x,
float **y,
size_t nSamples);
void process(
std::array<const float *, N_CHANNELS> x,
std::array<float *, N_CHANNELS> y,
size_t nSamples);
void setWah(float value);
/*! <<<...
* }
* ```
* }}} */
/*** 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. */
private:
bw_wah_coeffs coeffs;
bw_wah_state states[N_CHANNELS];
bw_wah_state *statesP[N_CHANNELS];
};
template<size_t N_CHANNELS>
inline Wah<N_CHANNELS>::Wah() {
bw_wah_init(&coeffs);
for (size_t i = 0; i < N_CHANNELS; i++)
statesP[i] = states + i;
}
template<size_t N_CHANNELS>
inline void Wah<N_CHANNELS>::setSampleRate(float sampleRate) {
bw_wah_set_sample_rate(&coeffs, sampleRate);
}
template<size_t N_CHANNELS>
inline void Wah<N_CHANNELS>::reset() {
bw_wah_reset_coeffs(&coeffs);
for (size_t i = 0; i < N_CHANNELS; i++)
bw_wah_reset_state(&coeffs, states + i);
}
template<size_t N_CHANNELS>
inline void Wah<N_CHANNELS>::process(
const float * const *x,
float **y,
size_t nSamples) {
bw_wah_process_multi(&coeffs, statesP, x, y, N_CHANNELS, nSamples);
}
template<size_t N_CHANNELS>
inline void Wah<N_CHANNELS>::process(
std::array<const float *, N_CHANNELS> x,
std::array<float *, N_CHANNELS> y,
size_t nSamples) {
process(x.data(), y.data(), nSamples);
}
template<size_t N_CHANNELS>
inline void Wah<N_CHANNELS>::setWah(float value) {
bw_wah_set_wah(&coeffs, value);
}
} }
#endif #endif

117
include/bwpp_svf.h
View File

@ -1,117 +0,0 @@
/*
* Brickworks
*
* Copyright (C) 2023 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
*/
#ifndef BWPP_SVF_H
#define BWPP_SVF_H
#include <bw_svf.h>
#include <array>
namespace Brickworks {
/*! api {{{
* ##### Brickworks::SVF
* ```>>> */
template<size_t N_CHANNELS>
class SVF {
public:
SVF();
void setSampleRate(float sampleRate);
void reset(float x0 = 0.f);
void process(
std::array<const float *, N_CHANNELS> x,
std::array<float *, N_CHANNELS> y_lp,
std::array<float *, N_CHANNELS> y_bp,
std::array<float *, N_CHANNELS> y_hp,
int nSamples);
void setCutoff(float value);
void setQ(float value);
void setPrewarpAtCutoff(bool value);
void setPrewarpFreq(float value);
/*! <<<...
* }
* ```
* }}} */
/*** 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. */
private:
bw_svf_coeffs coeffs;
bw_svf_state states[N_CHANNELS];
bw_svf_state *statesP[N_CHANNELS];
};
template<size_t N_CHANNELS>
inline SVF<N_CHANNELS>::SVF() {
bw_svf_init(&coeffs);
for (size_t i = 0; i < N_CHANNELS; i++)
statesP[i] = states + i;
}
template<size_t N_CHANNELS>
inline void SVF<N_CHANNELS>::setSampleRate(float sampleRate) {
bw_svf_set_sample_rate(&coeffs, sampleRate);
}
template<size_t N_CHANNELS>
inline void SVF<N_CHANNELS>::reset(float x0) {
bw_svf_reset_coeffs(&coeffs);
for (size_t i = 0; i < N_CHANNELS; i++)
bw_svf_reset_state(&coeffs, states + i, x0);
}
template<size_t N_CHANNELS>
inline void SVF<N_CHANNELS>::process(
std::array<const float *, N_CHANNELS> x,
std::array<float *, N_CHANNELS> y_lp,
std::array<float *, N_CHANNELS> y_bp,
std::array<float *, N_CHANNELS> y_hp,
int nSamples) {
bw_svf_process_multi(&coeffs, statesP, x.data(), y_lp.data(), y_bp.data(), y_hp.data(), N_CHANNELS, nSamples);
}
template<size_t N_CHANNELS>
inline void SVF<N_CHANNELS>::setCutoff(float value) {
bw_svf_set_cutoff(&coeffs, value);
}
template<size_t N_CHANNELS>
inline void SVF<N_CHANNELS>::setQ(float value) {
bw_svf_set_Q(&coeffs, value);
}
template<size_t N_CHANNELS>
inline void SVF<N_CHANNELS>::setPrewarpAtCutoff(bool value) {
bw_svf_set_prewarp_at_cutoff(&coeffs, value);
}
template<size_t N_CHANNELS>
inline void SVF<N_CHANNELS>::setPrewarpFreq(float value) {
bw_svf_set_prewarp_freq(&coeffs, value);
}
}
#endif

95
include/bwpp_wah.h
View File

@ -1,95 +0,0 @@
/*
* Brickworks
*
* Copyright (C) 2023 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
*/
#ifndef BWPP_WAH_H
#define BWPP_WAH_H
#include <bw_wah.h>
#include <array>
namespace Brickworks {
/*! api {{{
* ##### Brickworks::Wah
* ```>>> */
template<size_t N_CHANNELS>
class Wah {
public:
Wah();
void setSampleRate(float sampleRate);
void reset();
void process(
std::array<const float *, N_CHANNELS> x,
std::array<float *, N_CHANNELS> y,
int nSamples);
void setWah(float value);
/*! <<<...
* }
* ```
* }}} */
/*** 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. */
private:
bw_wah_coeffs coeffs;
bw_wah_state states[N_CHANNELS];
bw_wah_state *statesP[N_CHANNELS];
};
template<size_t N_CHANNELS>
inline Wah<N_CHANNELS>::Wah() {
bw_wah_init(&coeffs);
for (size_t i = 0; i < N_CHANNELS; i++)
statesP[i] = states + i;
}
template<size_t N_CHANNELS>
inline void Wah<N_CHANNELS>::setSampleRate(float sampleRate) {
bw_wah_set_sample_rate(&coeffs, sampleRate);
}
template<size_t N_CHANNELS>
inline void Wah<N_CHANNELS>::reset() {
bw_wah_reset_coeffs(&coeffs);
for (size_t i = 0; i < N_CHANNELS; i++)
bw_wah_reset_state(&coeffs, states + i);
}
template<size_t N_CHANNELS>
inline void Wah<N_CHANNELS>::process(
std::array<const float *, N_CHANNELS> x,
std::array<float *, N_CHANNELS> y,
int nSamples) {
bw_wah_process_multi(&coeffs, statesP, x.data(), y.data(), N_CHANNELS, nSamples);
}
template<size_t N_CHANNELS>
inline void Wah<N_CHANNELS>::setWah(float value) {
bw_wah_set_wah(&coeffs, value);
}
}
#endif