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

added blackman harris

Browse source
This commit is contained in:
Robert 2021-04-29 17:25:35 +02:00
parent c903658f65
commit 291b985bc3
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/FFT.cpp
View file

@ -18,6 +18,7 @@ inline double WindowRectangle(unsigned int k, unsigned int offset, unsigned int
inline double WindowVonHann(unsigned int k, unsigned int offset, unsigned int width); inline double WindowVonHann(unsigned int k, unsigned int offset, unsigned int width);
inline double WindowGauss(unsigned int k, unsigned int offset, unsigned int width); inline double WindowGauss(unsigned int k, unsigned int offset, unsigned int width);
inline double WindowTriangle(unsigned int k, unsigned int offset, unsigned int width); inline double WindowTriangle(unsigned int k, unsigned int offset, unsigned int width);
inline double WindowBlackman(unsigned int k, unsigned int offset, unsigned int width);
std::vector<std::complex<double>> std::vector<std::complex<double>>
radix2dit( radix2dit(
@ -103,6 +104,7 @@ void SetWindowFunction(WindowFunctions func, unsigned int width)
case WindowFunctions::VON_HANN: window = std::bind(WindowVonHann, std::placeholders::_1, 0, width); break; case WindowFunctions::VON_HANN: window = std::bind(WindowVonHann, std::placeholders::_1, 0, width); break;
case WindowFunctions::GAUSS: window = std::bind(WindowGauss, std::placeholders::_1, 0, width); break; case WindowFunctions::GAUSS: window = std::bind(WindowGauss, std::placeholders::_1, 0, width); break;
case WindowFunctions::TRIANGLE: window = std::bind(WindowTriangle, std::placeholders::_1, 0, width); break; case WindowFunctions::TRIANGLE: window = std::bind(WindowTriangle, std::placeholders::_1, 0, width); break;
case WindowFunctions::BLACKMAN: window = std::bind(WindowBlackman, std::placeholders::_1, 0, width); break;
} }
} }
@ -126,3 +128,8 @@ inline double WindowTriangle(unsigned int k, unsigned int offset, unsigned int w
{ {
return 1.0f - std::abs(((double)k - ((double)width / 2.0f)) / ((double)width / 2.0f)); return 1.0f - std::abs(((double)k - ((double)width / 2.0f)) / ((double)width / 2.0f));
} }
inline double WindowBlackman(unsigned int k, unsigned int offset, unsigned int width)
{
return 0.5f * (1.0f - 0.16f) - 0.5f * cos(2.0f * M_PI * k / (width - 1)) + 0.5f * 0.16f * cos(4.0f * M_PI * k / (width - 1));
}

3
src/FFT.hpp
View file

@ -6,7 +6,8 @@ enum class WindowFunctions {
RECTANGLE, RECTANGLE,
GAUSS, GAUSS,
VON_HANN, VON_HANN,
TRIANGLE TRIANGLE,
BLACKMAN
}; };
extern std::vector<std::pair<double, double>> FFT(const std::vector<double>::const_iterator& begin, extern std::vector<std::pair<double, double>> FFT(const std::vector<double>::const_iterator& begin,

5
src/main.cpp
View file

@ -15,7 +15,8 @@ const std::map<std::string, WindowFunctions> FUNCTIONS {
{"rectangle", WindowFunctions::RECTANGLE}, {"rectangle", WindowFunctions::RECTANGLE},
{"von-hann", WindowFunctions::VON_HANN}, {"von-hann", WindowFunctions::VON_HANN},
{"gauss", WindowFunctions::GAUSS}, {"gauss", WindowFunctions::GAUSS},
{"triangle", WindowFunctions::TRIANGLE} {"triangle", WindowFunctions::TRIANGLE},
{"blackman", WindowFunctions::BLACKMAN}
}; };
struct Settings { struct Settings {
@ -138,7 +139,7 @@ Settings Parse(int argc, char** argv)
("i,interval", "Splits audio file into intervals of length i milliseconds and transforms them individually (0 to not split file)", cxxopts::value<float>()) ("i,interval", "Splits audio file into intervals of length i milliseconds and transforms them individually (0 to not split file)", cxxopts::value<float>())
("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)", 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"))
("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")