diff options
| author | Chris Robinson <[email protected]> | 2018-11-19 09:10:36 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2018-11-19 09:10:36 -0800 |
| commit | 387a34ca002bdc25cc31fb8514c0fa2e44af6e1b (patch) | |
| tree | 268ac0fff88d694d90502072e6fce2b38c831e10 /Alc/filters/filter.cpp | |
| parent | 07386e79de93988faccc98166a036b6234ff9fe1 (diff) | |
Clean up the biquad filter a bit
Diffstat (limited to 'Alc/filters/filter.cpp')
| -rw-r--r-- | Alc/filters/filter.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/Alc/filters/filter.cpp b/Alc/filters/filter.cpp index 838a9a5d..6099cf13 100644 --- a/Alc/filters/filter.cpp +++ b/Alc/filters/filter.cpp @@ -1,6 +1,8 @@ #include "config.h" +#include <cmath> + #include "AL/alc.h" #include "AL/al.h" @@ -19,15 +21,15 @@ void BiquadFilter_setParams(BiquadFilter *filter, BiquadType type, ALfloat gain, assert(gain > 0.00001f); w0 = F_TAU * f0norm; - sin_w0 = sinf(w0); - cos_w0 = cosf(w0); + sin_w0 = std::sin(w0); + cos_w0 = std::cos(w0); alpha = sin_w0/2.0f * rcpQ; /* Calculate filter coefficients depending on filter type */ switch(type) { - case BiquadType_HighShelf: - sqrtgain_alpha_2 = 2.0f * sqrtf(gain) * alpha; + case BiquadType::HighShelf: + sqrtgain_alpha_2 = 2.0f * std::sqrt(gain) * alpha; b[0] = gain*((gain+1.0f) + (gain-1.0f)*cos_w0 + sqrtgain_alpha_2); b[1] = -2.0f*gain*((gain-1.0f) + (gain+1.0f)*cos_w0 ); b[2] = gain*((gain+1.0f) + (gain-1.0f)*cos_w0 - sqrtgain_alpha_2); @@ -35,8 +37,8 @@ void BiquadFilter_setParams(BiquadFilter *filter, BiquadType type, ALfloat gain, a[1] = 2.0f* ((gain-1.0f) - (gain+1.0f)*cos_w0 ); a[2] = (gain+1.0f) - (gain-1.0f)*cos_w0 - sqrtgain_alpha_2; break; - case BiquadType_LowShelf: - sqrtgain_alpha_2 = 2.0f * sqrtf(gain) * alpha; + case BiquadType::LowShelf: + sqrtgain_alpha_2 = 2.0f * std::sqrt(gain) * alpha; b[0] = gain*((gain+1.0f) - (gain-1.0f)*cos_w0 + sqrtgain_alpha_2); b[1] = 2.0f*gain*((gain-1.0f) - (gain+1.0f)*cos_w0 ); b[2] = gain*((gain+1.0f) - (gain-1.0f)*cos_w0 - sqrtgain_alpha_2); @@ -44,8 +46,8 @@ void BiquadFilter_setParams(BiquadFilter *filter, BiquadType type, ALfloat gain, a[1] = -2.0f* ((gain-1.0f) + (gain+1.0f)*cos_w0 ); a[2] = (gain+1.0f) + (gain-1.0f)*cos_w0 - sqrtgain_alpha_2; break; - case BiquadType_Peaking: - gain = sqrtf(gain); + case BiquadType::Peaking: + gain = std::sqrt(gain); b[0] = 1.0f + alpha * gain; b[1] = -2.0f * cos_w0; b[2] = 1.0f - alpha * gain; @@ -54,7 +56,7 @@ void BiquadFilter_setParams(BiquadFilter *filter, BiquadType type, ALfloat gain, a[2] = 1.0f - alpha / gain; break; - case BiquadType_LowPass: + case BiquadType::LowPass: b[0] = (1.0f - cos_w0) / 2.0f; b[1] = 1.0f - cos_w0; b[2] = (1.0f - cos_w0) / 2.0f; @@ -62,7 +64,7 @@ void BiquadFilter_setParams(BiquadFilter *filter, BiquadType type, ALfloat gain, a[1] = -2.0f * cos_w0; a[2] = 1.0f - alpha; break; - case BiquadType_HighPass: + case BiquadType::HighPass: b[0] = (1.0f + cos_w0) / 2.0f; b[1] = -(1.0f + cos_w0); b[2] = (1.0f + cos_w0) / 2.0f; @@ -70,7 +72,7 @@ void BiquadFilter_setParams(BiquadFilter *filter, BiquadType type, ALfloat gain, a[1] = -2.0f * cos_w0; a[2] = 1.0f - alpha; break; - case BiquadType_BandPass: + case BiquadType::BandPass: b[0] = alpha; b[1] = 0; b[2] = -alpha; |