Improved: Switched to stricter code formatter (Uncrustify) for better consistency across all source files.
This commit is contained in:
jthedering committed
1 parent
a1be4cc70f
commit
57e8158efd
202 files changed
+4595
-4284
No files matched your search
+52
-52
@@ -1,20 +1,20 @@
|
||||
/*
|
||||
This file is part of EqualizerAPO, a system-wide equalizer.
|
||||
Copyright (C) 2015 Jonas Thedering
|
||||
This file is part of EqualizerAPO, a system-wide equalizer.
|
||||
Copyright (C) 2015 Jonas Thedering
|
||||
|
||||
This program 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; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
This program 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; either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program 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.
|
||||
This program 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 this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
You should have received a copy of the GNU General Public License along
|
||||
with this program; if not, write to the Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*/
|
||||
|
||||
#include "stdafx.h"
|
||||
@@ -32,7 +32,7 @@
|
||||
using namespace std;
|
||||
|
||||
GraphicEQFilter::GraphicEQFilter(const std::vector<FilterNode>& nodes, unsigned filterLength)
|
||||
:nodes(nodes), filterLength(filterLength)
|
||||
: nodes(nodes), filterLength(filterLength)
|
||||
{
|
||||
filters = NULL;
|
||||
}
|
||||
@@ -54,37 +54,37 @@ vector<wstring> GraphicEQFilter::initialize(float sampleRate, unsigned maxFrameC
|
||||
fftwf_plan planReverse = fftwf_plan_dft_1d(filterLength * 2, freqData, timeData, FFTW_BACKWARD, FFTW_ESTIMATE);
|
||||
|
||||
GainIterator gainIterator(nodes);
|
||||
for(unsigned i=0; i<filterLength; i++)
|
||||
for (unsigned i = 0; i < filterLength; i++)
|
||||
{
|
||||
double freq = i*1.0*sampleRate/(filterLength * 2);
|
||||
double freq = i * 1.0 * sampleRate / (filterLength * 2);
|
||||
double dbGain = gainIterator.gainAt(freq);
|
||||
float gain = (float)pow(10.0, dbGain / 20.0);
|
||||
|
||||
freqData[i][0] = gain;
|
||||
freqData[i][1] = 0;
|
||||
freqData[2*filterLength-i-1][0] = gain;
|
||||
freqData[2*filterLength-i-1][1] = 0;
|
||||
freqData[2 * filterLength - i - 1][0] = gain;
|
||||
freqData[2 * filterLength - i - 1][1] = 0;
|
||||
}
|
||||
|
||||
mps(timeData, freqData, planForward, planReverse);
|
||||
|
||||
fftwf_execute(planReverse);
|
||||
|
||||
for(unsigned i=0; i<2*filterLength; i++)
|
||||
for (unsigned i = 0; i < 2 * filterLength; i++)
|
||||
{
|
||||
timeData[i][0] /= 2*filterLength;
|
||||
timeData[i][1] /= 2*filterLength;
|
||||
timeData[i][0] /= 2 * filterLength;
|
||||
timeData[i][1] /= 2 * filterLength;
|
||||
}
|
||||
|
||||
for(unsigned i=0; i<filterLength; i++)
|
||||
for (unsigned i = 0; i < filterLength; i++)
|
||||
{
|
||||
float factor=(float)(0.5*(1+cos(2*M_PI*i*1.0/(2*filterLength))));
|
||||
float factor = (float)(0.5 * (1 + cos(2 * M_PI * i * 1.0 / (2 * filterLength))));
|
||||
timeData[i][0] *= factor;
|
||||
timeData[i][1] *= factor;
|
||||
}
|
||||
|
||||
float* buf = new float[filterLength];
|
||||
for(unsigned i=0; i<filterLength; i++)
|
||||
for (unsigned i = 0; i < filterLength; i++)
|
||||
{
|
||||
buf[i] = timeData[i][0];
|
||||
}
|
||||
@@ -95,7 +95,7 @@ vector<wstring> GraphicEQFilter::initialize(float sampleRate, unsigned maxFrameC
|
||||
fftwf_destroy_plan(planReverse);
|
||||
|
||||
filters = (HConvSingle*)MemoryHelper::alloc(sizeof(HConvSingle) * channelCount);
|
||||
for(unsigned i=0; i<channelCount; i++)
|
||||
for (unsigned i = 0; i < channelCount; i++)
|
||||
{
|
||||
hcInitSingle(&filters[i], buf, filterLength, maxFrameCount, 1);
|
||||
}
|
||||
@@ -108,10 +108,10 @@ vector<wstring> GraphicEQFilter::initialize(float sampleRate, unsigned maxFrameC
|
||||
#pragma AVRT_CODE_BEGIN
|
||||
void GraphicEQFilter::process(float** output, float** input, unsigned frameCount)
|
||||
{
|
||||
if(filters == NULL)
|
||||
if (filters == NULL)
|
||||
return;
|
||||
|
||||
for(unsigned i=0; i<channelCount; i++)
|
||||
for (unsigned i = 0; i < channelCount; i++)
|
||||
{
|
||||
float* inputChannel = input[i];
|
||||
float* outputChannel = output[i];
|
||||
@@ -131,9 +131,9 @@ const std::vector<FilterNode>& GraphicEQFilter::getNodes()
|
||||
|
||||
void GraphicEQFilter::cleanup()
|
||||
{
|
||||
if(filters != NULL)
|
||||
if (filters != NULL)
|
||||
{
|
||||
for(unsigned i=0; i<channelCount; i++)
|
||||
for (unsigned i = 0; i < channelCount; i++)
|
||||
hcCloseSingle(&filters[i]);
|
||||
|
||||
MemoryHelper::free(filters);
|
||||
@@ -144,43 +144,43 @@ void GraphicEQFilter::cleanup()
|
||||
// Minimum phase spectrum from coefficients
|
||||
void GraphicEQFilter::mps(fftwf_complex* timeData, fftwf_complex* freqData, fftwf_plan planForward, fftwf_plan planReverse)
|
||||
{
|
||||
double threshold=pow(10.0, -100.0/20.0);
|
||||
float logThreshold=(float)log(threshold);
|
||||
|
||||
for(unsigned i=0; i<filterLength * 2; i++)
|
||||
double threshold = pow(10.0, -100.0 / 20.0);
|
||||
float logThreshold = (float)log(threshold);
|
||||
|
||||
for (unsigned i = 0; i < filterLength * 2; i++)
|
||||
{
|
||||
if(freqData[i][0] < threshold)
|
||||
if (freqData[i][0] < threshold)
|
||||
freqData[i][0] = logThreshold;
|
||||
else
|
||||
freqData[i][0] = log(freqData[i][0]);
|
||||
|
||||
freqData[i][1]=0;
|
||||
|
||||
freqData[i][1] = 0;
|
||||
}
|
||||
|
||||
|
||||
fftwf_execute(planReverse);
|
||||
|
||||
for(unsigned i=0; i<filterLength * 2; i++)
|
||||
|
||||
for (unsigned i = 0; i < filterLength * 2; i++)
|
||||
{
|
||||
timeData[i][0] /= filterLength * 2;
|
||||
timeData[i][1] /= filterLength * 2;
|
||||
}
|
||||
|
||||
for(unsigned i=1; i<filterLength; i++)
|
||||
|
||||
for (unsigned i = 1; i < filterLength; i++)
|
||||
{
|
||||
timeData[i][0] += timeData[filterLength*2 - i][0];
|
||||
timeData[i][1] -= timeData[filterLength*2 - i][1];
|
||||
|
||||
timeData[filterLength*2 - i][0] = 0;
|
||||
timeData[filterLength*2 - i][1] = 0;
|
||||
timeData[i][0] += timeData[filterLength * 2 - i][0];
|
||||
timeData[i][1] -= timeData[filterLength * 2 - i][1];
|
||||
|
||||
timeData[filterLength * 2 - i][0] = 0;
|
||||
timeData[filterLength * 2 - i][1] = 0;
|
||||
}
|
||||
timeData[filterLength][1] *= -1;
|
||||
|
||||
|
||||
fftwf_execute(planForward);
|
||||
|
||||
for(unsigned i=0; i<filterLength * 2; i++)
|
||||
|
||||
for (unsigned i = 0; i < filterLength * 2; i++)
|
||||
{
|
||||
double eR=exp(freqData[i][0]);
|
||||
freqData[i][0]=float(eR*cos(freqData[i][1]));
|
||||
freqData[i][1]=float(eR*sin(freqData[i][1]));
|
||||
double eR = exp(freqData[i][0]);
|
||||
freqData[i][0] = float(eR * cos(freqData[i][1]));
|
||||
freqData[i][1] = float(eR * sin(freqData[i][1]));
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user