Skip to content

Fix NaNs in basic filters and Equalizer #7141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
michaelgregorius merged 3 commits into from
Mar 11, 2024
Merged

Fix NaNs in basic filters and Equalizer #7141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3448d0
Fix NaNs in basic filters and Equalizer
michaelgregorius Mar 11, 2024
12a5981
Code review changes
michaelgregorius Mar 11, 2024
2991fa0
Style fixes
michaelgregorius Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion include/BasicFilters.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,12 @@ template<ch_cnt_t CHANNELS>
class BiQuad
{
public:
BiQuad()
BiQuad() :
m_a1(0.),
m_a2(0.),
m_b0(0.),
m_b1(0.),
m_b2(0.)
{
clearHistory();
}
Expand Down
5 changes: 4 additions & 1 deletion plugins/Eq/EqEffect.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,14 +289,17 @@ bool EqEffect::processAudioBuffer( sampleFrame *buf, const fpp_t frames )

float EqEffect::peakBand( float minF, float maxF, EqAnalyser *fft, int sr )
{
auto const fftEnergy = fft->getEnergy();
if (fftEnergy == 0.) { return 0.; }

float peak = -60;
float *b = fft->m_bands;
float h = 0;
for( int x = 0; x < MAX_BANDS; x++, b++ )
{
if( bandToFreq( x ,sr) >= minF && bandToFreq( x,sr ) <= maxF )
{
h = 20 * ( log10( *b / fft->getEnergy() ) );
h = 20. * log10(*b / fftEnergy);
peak = h > peak ? h : peak;
}
}
Expand Down
9 changes: 5 additions & 4 deletions plugins/Eq/EqSpectrumView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,10 @@ EqSpectrumView::EqSpectrumView(EqAnalyser *b, QWidget *_parent) :

void EqSpectrumView::paintEvent(QPaintEvent *event)
{
const float energy = m_analyser->getEnergy();
if( energy <= 0 && m_peakSum <= 0 )
const float energy = m_analyser->getEnergy();
if (energy <= 0.)
{
//dont draw anything
// If there is no energy in the signal we don't need to draw anything
return;
}

Expand All @@ -238,7 +238,8 @@ void EqSpectrumView::paintEvent(QPaintEvent *event)
const float fallOff = 1.07;
for( int x = 0; x < MAX_BANDS; ++x, ++bands )
{
peak = ( fh * 2.0 / 3.0 * ( 20 * ( log10( *bands / energy ) ) - LOWER_Y ) / ( - LOWER_Y ) );
peak = *bands != 0. ? (fh * 2.0 / 3.0 * (20. * log10(*bands / energy) - LOWER_Y) / (-LOWER_Y)) : 0.;

if( peak < 0 )
{
peak = 0;
Expand Down