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

bw_osc_{saw,pulse,tri}: extra validation checks and cosmetics

Browse Source
This commit is contained in:
Stefano D'Angelo 2024-06-22 18:49:12 +02:00
parent 5d3fbdbb0a
commit 93ddf112bb
3 changed files with 45 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
include/bw_osc_pulse.h
View File

@ -44,6 +44,9 @@
* <code>x_inc</code> is not <code>BW_NULL</code> when antialiasing * <code>x_inc</code> is not <code>BW_NULL</code> when antialiasing
* is on and that buffers used for both input and output appear at * is on and that buffers used for both input and output appear at
* the same channel indices.</li> * the same channel indices.</li>
* <li>Added extra checks in
* <code>bw_osc_pulse_coeffs_is_valid()</code>.</li>
* <li>Changed the name of C++ arguments to camel case.</li>
* </ul> * </ul>
* </li> * </li>
* <li>Version <strong>1.1.0</strong>: * <li>Version <strong>1.1.0</strong>:
@ -547,7 +550,15 @@ static inline char bw_osc_pulse_coeffs_is_valid(
return 0; return 0;
#endif #endif
return bw_is_finite(coeffs->pulse_width) && coeffs->pulse_width >= 0.f && coeffs->pulse_width <= 1.f; if (!bw_is_finite(coeffs->pulse_width) || coeffs->pulse_width < 0.f || coeffs->pulse_width > 1.f)
return 0;
#ifdef BW_DEBUG_DEEP
if (coeffs->state >= bw_gain_coeffs_state_reset_coeffs && !bw_one_pole_state_is_valid(&coeffs->smooth_coeffs, &coeffs->smooth_state))
return 0;
#endif
return 1;
} }
#ifdef __cplusplus #ifdef __cplusplus
@ -576,14 +587,14 @@ public:
void process( void process(
const float * const * x, const float * const * x,
const float * const * x_inc, const float * const * xInc,
float * const * y, float * const * y,
size_t nSamples); size_t nSamples);
#ifndef BW_CXX_NO_ARRAY #ifndef BW_CXX_NO_ARRAY
void process( void process(
std::array<const float *, N_CHANNELS> x, std::array<const float *, N_CHANNELS> x,
std::array<const float *, N_CHANNELS> x_inc, std::array<const float *, N_CHANNELS> xInc,
std::array<float *, N_CHANNELS> y, std::array<float *, N_CHANNELS> y,
size_t nSamples); size_t nSamples);
#endif #endif
@ -626,20 +637,20 @@ inline void OscPulse<N_CHANNELS>::reset() {
template<size_t N_CHANNELS> template<size_t N_CHANNELS>
inline void OscPulse<N_CHANNELS>::process( inline void OscPulse<N_CHANNELS>::process(
const float * const * x, const float * const * x,
const float * const * x_inc, const float * const * xInc,
float * const * y, float * const * y,
size_t nSamples) { size_t nSamples) {
bw_osc_pulse_process_multi(&coeffs, x, x_inc, y, N_CHANNELS, nSamples); bw_osc_pulse_process_multi(&coeffs, x, xInc, y, N_CHANNELS, nSamples);
} }
#ifndef BW_CXX_NO_ARRAY #ifndef BW_CXX_NO_ARRAY
template<size_t N_CHANNELS> template<size_t N_CHANNELS>
inline void OscPulse<N_CHANNELS>::process( inline void OscPulse<N_CHANNELS>::process(
std::array<const float *, N_CHANNELS> x, std::array<const float *, N_CHANNELS> x,
std::array<const float *, N_CHANNELS> x_inc, std::array<const float *, N_CHANNELS> xInc,
std::array<float *, N_CHANNELS> y, std::array<float *, N_CHANNELS> y,
size_t nSamples) { size_t nSamples) {
process(x.data(), x_inc.data(), y.data(), nSamples); process(x.data(), xInc.data(), y.data(), nSamples);
} }
#endif #endif

16
include/bw_osc_saw.h
View File

@ -43,6 +43,7 @@
* <code>x_inc</code> is not <code>BW_NULL</code> when antialiasing * <code>x_inc</code> is not <code>BW_NULL</code> when antialiasing
* is on and that buffers used for both input and output appear at * is on and that buffers used for both input and output appear at
* the same channel indices.</li> * the same channel indices.</li>
* <li>Changed the name of C++ arguments to camel case.</li>
* </ul> * </ul>
* </li> * </li>
* <li>Version <strong>1.1.0</strong>: * <li>Version <strong>1.1.0</strong>:
@ -524,19 +525,20 @@ public:
void process( void process(
const float * const * x, const float * const * x,
const float * const * x_inc, const float * const * xInc,
float * const * y, float * const * y,
size_t nSamples); size_t nSamples);
#ifndef BW_CXX_NO_ARRAY #ifndef BW_CXX_NO_ARRAY
void process( void process(
std::array<const float *, N_CHANNELS> x, std::array<const float *, N_CHANNELS> x,
std::array<const float *, N_CHANNELS> x_inc, std::array<const float *, N_CHANNELS> xInc,
std::array<float *, N_CHANNELS> y, std::array<float *, N_CHANNELS> y,
size_t nSamples); size_t nSamples);
#endif #endif
void setAntialiasing(bool value); void setAntialiasing(
bool value);
/*! <<<... /*! <<<...
* } * }
* ``` * ```
@ -570,20 +572,20 @@ inline void OscSaw<N_CHANNELS>::reset() {
template<size_t N_CHANNELS> template<size_t N_CHANNELS>
inline void OscSaw<N_CHANNELS>::process( inline void OscSaw<N_CHANNELS>::process(
const float * const * x, const float * const * x,
const float * const * x_inc, const float * const * xInc,
float * const * y, float * const * y,
size_t nSamples) { size_t nSamples) {
bw_osc_saw_process_multi(&coeffs, x, x_inc, y, N_CHANNELS, nSamples); bw_osc_saw_process_multi(&coeffs, x, xInc, y, N_CHANNELS, nSamples);
} }
#ifndef BW_CXX_NO_ARRAY #ifndef BW_CXX_NO_ARRAY
template<size_t N_CHANNELS> template<size_t N_CHANNELS>
inline void OscSaw<N_CHANNELS>::process( inline void OscSaw<N_CHANNELS>::process(
std::array<const float *, N_CHANNELS> x, std::array<const float *, N_CHANNELS> x,
std::array<const float *, N_CHANNELS> x_inc, std::array<const float *, N_CHANNELS> xInc,
std::array<float *, N_CHANNELS> y, std::array<float *, N_CHANNELS> y,
size_t nSamples) { size_t nSamples) {
process(x.data(), x_inc.data(), y.data(), nSamples); process(x.data(), xInc.data(), y.data(), nSamples);
} }
#endif #endif

25
include/bw_osc_tri.h
View File

@ -44,6 +44,9 @@
* <code>x_inc</code> is not <code>BW_NULL</code> when antialiasing * <code>x_inc</code> is not <code>BW_NULL</code> when antialiasing
* is on and that buffers used for both input and output appear at * is on and that buffers used for both input and output appear at
* the same channel indices.</li> * the same channel indices.</li>
* <li>Added extra checks in
* <code>bw_osc_pulse_coeffs_is_valid()</code>.</li>
* <li>Changed the name of C++ arguments to camel case.</li>
* </ul> * </ul>
* </li> * </li>
* <li>Version <strong>1.1.0</strong>: * <li>Version <strong>1.1.0</strong>:
@ -554,7 +557,15 @@ static inline char bw_osc_tri_coeffs_is_valid(
return 0; return 0;
#endif #endif
return bw_is_finite(coeffs->slope) && coeffs->slope >= 0.001f && coeffs->slope <= 0.999f; if (!bw_is_finite(coeffs->slope) || coeffs->slope < 0.001f || coeffs->slope > 0.999f)
return 0;
#ifdef BW_DEBUG_DEEP
if (coeffs->state >= bw_gain_coeffs_state_reset_coeffs && !bw_one_pole_state_is_valid(&coeffs->smooth_coeffs, &coeffs->smooth_state))
return 0;
#endif
return 1;
} }
#ifdef __cplusplus #ifdef __cplusplus
@ -583,14 +594,14 @@ public:
void process( void process(
const float * const * x, const float * const * x,
const float * const * x_inc, const float * const * xInc,
float * const * y, float * const * y,
size_t nSamples); size_t nSamples);
#ifndef BW_CXX_NO_ARRAY #ifndef BW_CXX_NO_ARRAY
void process( void process(
std::array<const float *, N_CHANNELS> x, std::array<const float *, N_CHANNELS> x,
std::array<const float *, N_CHANNELS> x_inc, std::array<const float *, N_CHANNELS> xInc,
std::array<float *, N_CHANNELS> y, std::array<float *, N_CHANNELS> y,
size_t nSamples); size_t nSamples);
#endif #endif
@ -633,20 +644,20 @@ inline void OscTri<N_CHANNELS>::reset() {
template<size_t N_CHANNELS> template<size_t N_CHANNELS>
inline void OscTri<N_CHANNELS>::process( inline void OscTri<N_CHANNELS>::process(
const float * const * x, const float * const * x,
const float * const * x_inc, const float * const * xInc,
float * const * y, float * const * y,
size_t nSamples) { size_t nSamples) {
bw_osc_tri_process_multi(&coeffs, x, x_inc, y, N_CHANNELS, nSamples); bw_osc_tri_process_multi(&coeffs, x, xInc, y, N_CHANNELS, nSamples);
} }
#ifndef BW_CXX_NO_ARRAY #ifndef BW_CXX_NO_ARRAY
template<size_t N_CHANNELS> template<size_t N_CHANNELS>
inline void OscTri<N_CHANNELS>::process( inline void OscTri<N_CHANNELS>::process(
std::array<const float *, N_CHANNELS> x, std::array<const float *, N_CHANNELS> x,
std::array<const float *, N_CHANNELS> x_inc, std::array<const float *, N_CHANNELS> xInc,
std::array<float *, N_CHANNELS> y, std::array<float *, N_CHANNELS> y,
size_t nSamples) { size_t nSamples) {
process(x.data(), x_inc.data(), y.data(), nSamples); process(x.data(), xInc.data(), y.data(), nSamples);
} }
#endif #endif