lauchmelder/spectralyze
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

removed mertz

Browse source
This commit is contained in:
Robert 2021-04-30 11:36:18 +02:00
parent f2ad3bd04a
commit 0609fe6c33
3 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/FFT.cpp
View file

@ -58,8 +58,7 @@ FFT(const std::vector<double>::const_iterator& begin,
const std::vector<double>::const_iterator& end, const std::vector<double>::const_iterator& end,
size_t sampleRate, size_t sampleRate,
double minFreq, double maxFreq, double minFreq, double maxFreq,
unsigned int zeropadding, unsigned int zeropadding)
bool mertz)
{ {
std::vector<double> signal(begin, end); std::vector<double> signal(begin, end);
size_t N = signal.size(); size_t N = signal.size();
@ -90,10 +89,7 @@ FFT(const std::vector<double>::const_iterator& begin,
for (int k = freq / freqRes; freq < nyquistLimit && freq < maxFreq; k++) for (int k = freq / freqRes; freq < nyquistLimit && freq < maxFreq; k++)
{ {
if(!mertz) output.push_back(std::make_pair(freq, 2.0f * std::abs(spectrum[k]) / (double)N));
output.push_back(std::make_pair(freq, 2.0f * std::abs(spectrum[k]) / (double)N));
else
output.push_back(std::make_pair(freq, 2.0f * (spectrum[k] * std::exp(-1i * std::arg(spectrum[k]))).real() / (double)N));
freq += freqRes; freq += freqRes;
} }

3
src/FFT.hpp
View file

@ -14,7 +14,6 @@ extern std::vector<std::pair<double, double>> FFT(const std::vector<double>::con
const std::vector<double>::const_iterator& end, const std::vector<double>::const_iterator& end,
size_t sampleRate, size_t sampleRate,
double minFreq, double maxFreq, double minFreq, double maxFreq,
unsigned int zeropadding, unsigned int zeropadding);
bool mertz);
extern void SetWindowFunction(WindowFunctions func, unsigned int width); extern void SetWindowFunction(WindowFunctions func, unsigned int width);

9
src/main.cpp
View file

@ -26,7 +26,6 @@ struct Settings {
double minFreq, maxFreq; double minFreq, maxFreq;
unsigned int analyzeChannel; unsigned int analyzeChannel;
unsigned int zeropadding; unsigned int zeropadding;
bool mertz;
WindowFunctions window; WindowFunctions window;
}; };
@ -73,8 +72,7 @@ int main(int argc, char** argv)
audioFile.samples[c-1].cend(), audioFile.samples[c-1].cend(),
sampleRate, sampleRate,
setts.minFreq, setts.maxFreq, setts.minFreq, setts.maxFreq,
setts.zeropadding, setts.zeropadding
setts.mertz
); );
output[chName] = nlohmann::json::array(); output[chName] = nlohmann::json::array();
@ -98,8 +96,7 @@ int main(int argc, char** argv)
), ),
sampleRate, sampleRate,
setts.minFreq, setts.maxFreq, setts.minFreq, setts.maxFreq,
setts.zeropadding, setts.zeropadding
setts.mertz
); );
output[chName].push_back({ output[chName].push_back({
@ -143,7 +140,6 @@ Settings Parse(int argc, char** argv)
("f,frequency", "Defines the frequency range of the output spectrum (Default: all the frequencies)", cxxopts::value<std::vector<double>>()) ("f,frequency", "Defines the frequency range of the output spectrum (Default: all the frequencies)", cxxopts::value<std::vector<double>>())
("p,pad", "Add extra zero-padding. By default, the program will pad the signals with 0s until the number of samples is a power of 2 (this would be equivalent to -p 1). With this option you can tell the program to instead pad until the power of 2 after the next one (-p 2) etc. This increases frequency resolution", cxxopts::value<unsigned int>()) ("p,pad", "Add extra zero-padding. By default, the program will pad the signals with 0s until the number of samples is a power of 2 (this would be equivalent to -p 1). With this option you can tell the program to instead pad until the power of 2 after the next one (-p 2) etc. This increases frequency resolution", cxxopts::value<unsigned int>())
("w,window", "Specify the window function used (rectangle (default), von-hann, gauss, triangle, blackman (3-term))", cxxopts::value<std::string>()->default_value("rectangle")) ("w,window", "Specify the window function used (rectangle (default), von-hann, gauss, triangle, blackman (3-term))", cxxopts::value<std::string>()->default_value("rectangle"))
("mertz", "Use the Mertz method to phase-correct the complex Fourier spectrum")
("m,mono", "Analyze only the given channel", cxxopts::value<unsigned int>()->default_value("0")) ("m,mono", "Analyze only the given channel", cxxopts::value<unsigned int>()->default_value("0"))
("files", "Files to fourier transform", cxxopts::value<std::vector<std::filesystem::path>>()) ("files", "Files to fourier transform", cxxopts::value<std::vector<std::filesystem::path>>())
("h,help", "Print usage") ("h,help", "Print usage")
@ -180,7 +176,6 @@ Settings Parse(int argc, char** argv)
setts.splitInterval = (result.count("interval") ? result["interval"].as<float>() : 0.0f); setts.splitInterval = (result.count("interval") ? result["interval"].as<float>() : 0.0f);
setts.analyzeChannel = (result.count("mono") ? result["mono"].as<unsigned int>() : 0); setts.analyzeChannel = (result.count("mono") ? result["mono"].as<unsigned int>() : 0);
setts.zeropadding = (result.count("pad") ? result["pad"].as<unsigned int>() : 1); setts.zeropadding = (result.count("pad") ? result["pad"].as<unsigned int>() : 1);
setts.mertz = (result.count("mertz") ? true : false);
if (!result.count("window")) if (!result.count("window"))
{ {