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

add silence_dc param to bw_bd_reduce, use it in examples

Browse Source
This commit is contained in:
Stefano D'Angelo 2024-02-21 10:37:20 +01:00
parent 61d3459b95
commit 43d20f5c52
3 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/fx_bitcrush/src/plugin.h
View File

@ -11,6 +11,7 @@ typedef struct plugin {
static void plugin_init(plugin *instance) {
bw_sr_reduce_init(&instance->sr_reduce_coeffs);
bw_bd_reduce_init(&instance->bd_reduce_coeffs);
bw_bd_reduce_set_silence_dc(&instance->bd_reduce_coeffs, 0);
}
static void plugin_fini(plugin *instance) {

1
examples/fxpp_bitcrush/src/impl.cpp
View File

@ -16,6 +16,7 @@ extern "C" {
impl impl_new(void) {
Engine *instance = new Engine();
instance->bd.setSilenceDc(0);
return reinterpret_cast<impl>(instance);
}

42
include/bw_bd_reduce.h
View File

@ -33,6 +33,7 @@
* <ul>
* <li>Version <strong>1.1.0</strong>:
* <ul>
* <li>Added silence_dc parameter.</li>
* <li>Now using <code>BW_NULL</code> and
* <code>BW_CXX_NO_ARRAY</code>.</li>
* </ul>
@ -176,6 +177,17 @@ static inline void bw_bd_reduce_set_bit_depth(
*
* Default value: `16`.
*
* #### bw_bd_reduce_set_silence_dc()
* ```>>> */
static inline void bw_bd_reduce_set_silence_dc(
bw_bd_reduce_coeffs * BW_RESTRICT coeffs,
char value);
/*! <<<```
* Sets whether the output value corresponding to silence has null dc
* (`value` `0`) or not (non-`0`) in `coeffs`.
*
* Default value: non-`0` (non-null dc).
*
* #### bw_bd_reduce_coeffs_is_valid()
* ```>>> */
static inline char bw_bd_reduce_coeffs_is_valid(
@ -222,6 +234,7 @@ struct bw_bd_reduce_coeffs {
// Coefficients
float ki;
float k;
float ko;
float max;
// Parameters
@ -234,6 +247,7 @@ static inline void bw_bd_reduce_init(
BW_ASSERT(coeffs != BW_NULL);
coeffs->bit_depth = 16;
coeffs->ko = 0.5f;
#ifdef BW_DEBUG_DEEP
coeffs->hash = bw_hash_sdbm("bw_bd_reduce_coeffs");
@ -316,7 +330,7 @@ static inline float bw_bd_reduce_process1(
BW_ASSERT_DEEP(coeffs->state >= bw_bd_reduce_coeffs_state_reset_coeffs);
BW_ASSERT(bw_is_finite(x));
const float y = coeffs->ki * (bw_floorf(coeffs->k * bw_clipf(x, -coeffs->max, coeffs->max)) + 0.5f);
const float y = coeffs->ki * (bw_floorf(coeffs->k * bw_clipf(x, -coeffs->max, coeffs->max)) + coeffs->ko);
BW_ASSERT_DEEP(bw_bd_reduce_coeffs_is_valid(coeffs));
BW_ASSERT_DEEP(coeffs->state >= bw_bd_reduce_coeffs_state_reset_coeffs);
@ -386,6 +400,19 @@ static inline void bw_bd_reduce_set_bit_depth(
BW_ASSERT_DEEP(coeffs->state >= bw_bd_reduce_coeffs_state_init);
}
static inline void bw_bd_reduce_set_silence_dc(
bw_bd_reduce_coeffs * BW_RESTRICT coeffs,
char value) {
BW_ASSERT(coeffs != BW_NULL);
BW_ASSERT_DEEP(bw_bd_reduce_coeffs_is_valid(coeffs));
BW_ASSERT_DEEP(coeffs->state >= bw_bd_reduce_coeffs_state_init);
coeffs->ko = value ? 0.5f : 0.f;
BW_ASSERT_DEEP(bw_bd_reduce_coeffs_is_valid(coeffs));
BW_ASSERT_DEEP(coeffs->state >= bw_bd_reduce_coeffs_state_init);
}
static inline char bw_bd_reduce_coeffs_is_valid(
const bw_bd_reduce_coeffs * BW_RESTRICT coeffs) {
BW_ASSERT(coeffs != BW_NULL);
@ -404,9 +431,11 @@ static inline char bw_bd_reduce_coeffs_is_valid(
if (coeffs->state >= bw_bd_reduce_coeffs_state_reset_coeffs) {
if (coeffs->bit_depth_prev < 1 || coeffs->bit_depth_prev > 64)
return 0;
if (!bw_is_finite(coeffs->ki) || coeffs->ki <= 0.f)
return 0;
if (!bw_is_finite(coeffs->k) || coeffs->k <= 0.f)
return 0;
if (!bw_is_finite(coeffs->ki) || coeffs->ki <= 0.f)
if (coeffs->ko != 0.f && coeffs->ko != 0.5f)
return 0;
if (!bw_is_finite(coeffs->max) || coeffs->max < 0.5f || coeffs->max > 1.f)
return 0;
@ -454,6 +483,9 @@ public:
void setBitDepth(
char value);
void setSilenceDc(
char value);
/*! <<<...
* }
* ```
@ -508,6 +540,12 @@ inline void BDReduce<N_CHANNELS>::setBitDepth(
bw_bd_reduce_set_bit_depth(&coeffs, value);
}
template<size_t N_CHANNELS>
inline void BDReduce<N_CHANNELS>::setSilenceDc(
char value) {
bw_bd_reduce_set_silence_dc(&coeffs, value);
}
}
#endif