mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Tidied up a few minor coding style discrepencies

Browse source
This commit is contained in:
jules 2018-04-10 09:50:11 +01:00
parent 2204c6b263
commit d691838765
13 changed files with 82 additions and 94 deletions
Download patch file Download diff file Expand all files Collapse all files

39
modules/juce_dsp/frequency/juce_FFT.cpp
View file

@ -166,10 +166,7 @@ struct FFTFallback : public FFT::Instance
void performRealOnlyForwardTransform (Complex<float>* scratch, float* d) const noexcept
{
for (int i = 0; i < size; ++i)
{
scratch[i].real (d[i]);
scratch[i].imag (0);
}
scratch[i] = { d[i], 0 };
perform (scratch, reinterpret_cast<Complex<float>*> (d), false);
}
@ -204,8 +201,8 @@ struct FFTFallback : public FFT::Instance
{
auto phase = i * inverseFactor;
twiddleTable[i].real ((float) std::cos (phase));
twiddleTable[i].imag ((float) std::sin (phase));
twiddleTable[i] = { (float) std::cos (phase),
(float) std::sin (phase) };
}
}
else
@ -214,16 +211,16 @@ struct FFTFallback : public FFT::Instance
{
auto phase = i * inverseFactor;
twiddleTable[i].real ((float) std::cos (phase));
twiddleTable[i].imag ((float) std::sin (phase));
twiddleTable[i] = { (float) std::cos (phase),
(float) std::sin (phase) };
}
for (int i = fftSize / 4; i < fftSize / 2; ++i)
{
auto index = i - fftSize / 4;
auto other = twiddleTable[i - fftSize / 4];
twiddleTable[i].real (inverse ? -twiddleTable[index].imag() : twiddleTable[index].imag());
twiddleTable[i].imag (inverse ? twiddleTable[index].real() : -twiddleTable[index].real());
twiddleTable[i] = { inverse ? -other.imag() : other.imag(),
inverse ? other.real() : -other.real() };
}
twiddleTable[fftSize / 2].real (-1.0f);
@ -395,17 +392,19 @@ struct FFTFallback : public FFT::Instance
if (inverse)
{
data[length].real (s5.real() - s4.imag());
data[length].imag (s5.imag() + s4.real());
data[lengthX3].real (s5.real() + s4.imag());
data[lengthX3].imag (s5.imag() - s4.real());
data[length] = { s5.real() - s4.imag(),
s5.imag() + s4.real() };
data[lengthX3] = { s5.real() + s4.imag(),
s5.imag() - s4.real() };
}
else
{
data[length].real (s5.real() + s4.imag());
data[length].imag (s5.imag() - s4.real());
data[lengthX3].real (s5.real() - s4.imag());
data[lengthX3].imag (s5.imag() + s4.real());
data[length] = { s5.real() + s4.imag(),
s5.imag() - s4.real() };
data[lengthX3] = { s5.real() - s4.imag(),
s5.imag() + s4.real() };
}
++data;
@ -438,7 +437,7 @@ struct AppleFFT : public FFT::Instance
AppleFFT (int orderToUse)
: order (static_cast<vDSP_Length> (orderToUse)),
fftSetup (vDSP_create_fftsetup (order, 2)),
forwardNormalisation (.5f),
forwardNormalisation (0.5f),
inverseNormalisation (1.0f / static_cast<float> (1 << order))
{}