From 9fcd31e193cda667b209821b98e7f0c20e6444bb Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 28 Apr 2021 19:35:04 +0200 Subject: [PATCH 01/19] removed cxxparser from cmake --- .gitignore | 1 + CMakeLists.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 10e23fa..5361247 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ out bin +build .vs __pycache__ diff --git a/CMakeLists.txt b/CMakeLists.txt index 5dd2786..c4b65d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,8 @@ project(spectralyze) add_executable(spectralyze "src/main.cpp" - "src/FFT.hpp" "lib/cxxopts/cxxopts.hpp") + "src/FFT.hpp" + ) target_include_directories(spectralyze PRIVATE "lib/AudioFile" From 942bf79fea21071af84913ca5034bc22e90f2f98 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 28 Apr 2021 20:10:52 +0200 Subject: [PATCH 02/19] added frequency range option --- src/FFT.hpp | 13 ++++++++++--- src/main.cpp | 35 +++++++++++++++++++++++++++++++---- 2 files changed, 41 insertions(+), 7 deletions(-) diff --git a/src/FFT.hpp b/src/FFT.hpp index 3ee1615..51dba4a 100644 --- a/src/FFT.hpp +++ b/src/FFT.hpp @@ -49,7 +49,11 @@ std::vector> radix2dit(const std::vector::const_ite return output; } -std::vector> FFT(const std::vector::const_iterator& begin, const std::vector::const_iterator& end, size_t sampleRate) +std::vector> +FFT(const std::vector::const_iterator& begin, + const std::vector::const_iterator& end, + size_t sampleRate, + double minFreq, double maxFreq) { std::vector signal(begin, end); size_t N = signal.size(); @@ -65,8 +69,11 @@ std::vector> FFT(const std::vector::const_iter double nyquistLimit = (double)sampleRate / 2.0f; std::vector> output; - double freq = 0.0f; - for (int k = 0; freq < nyquistLimit; k++) + double freq = minFreq; + if (maxFreq == 0) + maxFreq = nyquistLimit; + + for (int k = freq / freqRes; freq < nyquistLimit && freq < maxFreq; k++) { output.push_back(std::make_pair(freq, 2.0f * std::abs(spectrum[k]) / (double)N)); freq += freqRes; diff --git a/src/main.cpp b/src/main.cpp index f2914f1..45ce2df 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -14,6 +14,7 @@ struct Settings { std::vector files; bool quiet; float splitInterval; + double minFreq, maxFreq; }; Settings Parse(int argc, char** argv); @@ -46,7 +47,12 @@ int main(int argc, char** argv) if (setts.splitInterval == 0.0f) { - std::vector> spectrum = FFT(audioFile.samples[c-1].cbegin(), audioFile.samples[c-1].cend(), sampleRate); + std::vector> spectrum = + FFT( + audioFile.samples[c-1].cbegin(), + audioFile.samples[c-1].cend(), + sampleRate, + setts.minFreq, setts.maxFreq); output[chName] = nlohmann::json::array(); for (const std::pair& pair : spectrum) { @@ -64,8 +70,10 @@ int main(int argc, char** argv) audioFile.samples[c-1].cbegin() + currentSample, std::min( audioFile.samples[c-1].cbegin() + currentSample + sampleInterval, - audioFile.samples[c-1].cend()), - sampleRate + audioFile.samples[c-1].cend() + ), + sampleRate, + setts.minFreq, setts.maxFreq ); output[chName].push_back({ @@ -102,10 +110,11 @@ Settings Parse(int argc, char** argv) cxxopts::Options options("spectralyze", "Fourier transforms audio files"); options .set_width(70) - .positional_help("file1 [file2...]") + .positional_help("FILE1 [FILE2...]") .add_options() ("q,quiet", "Suppress text output", cxxopts::value()->default_value("false")) ("i,interval", "Splits audio file into intervals of length i milliseconds and transforms them individually (0 to not split file)", cxxopts::value()) + ("f,frequency", "Defines the frequency range of the output spectrum (Default: all the frequencies)", cxxopts::value>()) ("files", "Files to fourier transform", cxxopts::value>()) ("h,help", "Print usage") ; @@ -119,6 +128,17 @@ Settings Parse(int argc, char** argv) exit(0); } + if (!result.count("frequency")) + { + setts.minFreq = 0.0f; + setts.maxFreq = 0.0f; + } + else + { + setts.minFreq = result["frequency"].as>()[0]; + setts.maxFreq = result["frequency"].as>()[1]; + } + if (!result.count("files")) { std::cerr << "At least one positional argument is required." << std::endl; @@ -128,6 +148,13 @@ Settings Parse(int argc, char** argv) setts.files = result["files"].as>(); setts.quiet = (result.count("quiet") ? result["quiet"].as() : false); setts.splitInterval = (result.count("interval") ? result["interval"].as() : 0.0f); + + + if (setts.maxFreq <= setts.minFreq && (setts.maxFreq != 0)) + { + std::cerr << "Maximum frequency cannot be smaller than minimum frequency" << std::endl; + exit(1); + } } catch (const cxxopts::OptionException& e) { From ea91cfb3684d24099f84f8236a37d1fe0f02d643 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 28 Apr 2021 22:26:10 +0200 Subject: [PATCH 03/19] added channel selector --- src/main.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 45ce2df..2a37684 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -15,6 +15,7 @@ struct Settings { bool quiet; float splitInterval; double minFreq, maxFreq; + unsigned int analyzeChannel; }; Settings Parse(int argc, char** argv); @@ -39,6 +40,12 @@ int main(int argc, char** argv) int numChannels = audioFile.getNumChannels(); nlohmann::json output; + int c = setts.analyzeChannel; + if (c == 0) + c = 1; + else + numChannels = c; + for (int c = 1; c <= numChannels; c++) { PRINTER(setts, "\rAnalyzing " << filename << "... Channel " << c << "/" << numChannels << " 0% "); @@ -115,6 +122,7 @@ Settings Parse(int argc, char** argv) ("q,quiet", "Suppress text output", cxxopts::value()->default_value("false")) ("i,interval", "Splits audio file into intervals of length i milliseconds and transforms them individually (0 to not split file)", cxxopts::value()) ("f,frequency", "Defines the frequency range of the output spectrum (Default: all the frequencies)", cxxopts::value>()) + ("m,mono", "Analyze only the given channel", cxxopts::value()->default_value("0")) ("files", "Files to fourier transform", cxxopts::value>()) ("h,help", "Print usage") ; @@ -148,6 +156,7 @@ Settings Parse(int argc, char** argv) setts.files = result["files"].as>(); setts.quiet = (result.count("quiet") ? result["quiet"].as() : false); setts.splitInterval = (result.count("interval") ? result["interval"].as() : 0.0f); + setts.analyzeChannel = (result.count("mono") ? result["mono"].as() : 0); if (setts.maxFreq <= setts.minFreq && (setts.maxFreq != 0)) From b7e7790d860883a26a7724c2a41b2214f77b6328 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 28 Apr 2021 23:11:16 +0200 Subject: [PATCH 04/19] added zero padding --- src/FFT.hpp | 8 +++++++- src/main.cpp | 10 ++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/FFT.hpp b/src/FFT.hpp index 51dba4a..750100f 100644 --- a/src/FFT.hpp +++ b/src/FFT.hpp @@ -53,7 +53,8 @@ std::vector> FFT(const std::vector::const_iterator& begin, const std::vector::const_iterator& end, size_t sampleRate, - double minFreq, double maxFreq) + double minFreq, double maxFreq, + unsigned int zeropadding) { std::vector signal(begin, end); size_t N = signal.size(); @@ -64,6 +65,11 @@ FFT(const std::vector::const_iterator& begin, N++; } + if (zeropadding > 1) { + N = (signal.size() << (zeropadding - 1)); + signal.insert(signal.end(), N - signal.size(), 0); + } + std::vector> spectrum = radix2dit(signal.cbegin(), N, 1); double freqRes = (double)sampleRate / (double)N; double nyquistLimit = (double)sampleRate / 2.0f; diff --git a/src/main.cpp b/src/main.cpp index 2a37684..392824f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -16,6 +16,7 @@ struct Settings { float splitInterval; double minFreq, maxFreq; unsigned int analyzeChannel; + unsigned int zeropadding; }; Settings Parse(int argc, char** argv); @@ -59,7 +60,9 @@ int main(int argc, char** argv) audioFile.samples[c-1].cbegin(), audioFile.samples[c-1].cend(), sampleRate, - setts.minFreq, setts.maxFreq); + setts.minFreq, setts.maxFreq, + setts.zeropadding + ); output[chName] = nlohmann::json::array(); for (const std::pair& pair : spectrum) { @@ -80,7 +83,8 @@ int main(int argc, char** argv) audioFile.samples[c-1].cend() ), sampleRate, - setts.minFreq, setts.maxFreq + setts.minFreq, setts.maxFreq, + setts.zeropadding ); output[chName].push_back({ @@ -122,6 +126,7 @@ Settings Parse(int argc, char** argv) ("q,quiet", "Suppress text output", cxxopts::value()->default_value("false")) ("i,interval", "Splits audio file into intervals of length i milliseconds and transforms them individually (0 to not split file)", cxxopts::value()) ("f,frequency", "Defines the frequency range of the output spectrum (Default: all the frequencies)", cxxopts::value>()) + ("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()) ("m,mono", "Analyze only the given channel", cxxopts::value()->default_value("0")) ("files", "Files to fourier transform", cxxopts::value>()) ("h,help", "Print usage") @@ -157,6 +162,7 @@ Settings Parse(int argc, char** argv) setts.quiet = (result.count("quiet") ? result["quiet"].as() : false); setts.splitInterval = (result.count("interval") ? result["interval"].as() : 0.0f); setts.analyzeChannel = (result.count("mono") ? result["mono"].as() : 0); + setts.zeropadding = (result.count("pad") ? result["pad"].as() : 1); if (setts.maxFreq <= setts.minFreq && (setts.maxFreq != 0)) From c2bcf5ea6ffb4f7b58cd21f31457f18c2471508e Mon Sep 17 00:00:00 2001 From: Lauchmelder Date: Wed, 28 Apr 2021 23:42:31 +0200 Subject: [PATCH 05/19] Create LICENSE --- LICENSE | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 3 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. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. From 35620d3395340ba0ab7744697c59f1a69b032381 Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 29 Apr 2021 00:02:05 +0200 Subject: [PATCH 06/19] Updated readme --- README.md | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/README.md b/README.md index a684b03..83ce6d7 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,39 @@ spectralyze -i 50 coolSong.wav This would read in a file called `coolSong.wav`, split it into 50ms long audio segments and then transform each of those individually. The resulting spectrums will be stored in `coolSong.json` +## Setting a frequency range +By default, spectralyze will output the entire frequency spectrum, all the way up to the nyquist limit (which is half the sampling rate). If you are not interested in the entire spectrum you can tell the program the only output frequencies in the range you specify: +``` +spectralyze -f 0,2500 coolSong.wav +``` +This command would only output frequencies ranging from 0kHz-2kHz, greatly decreasing file size. + +## Disabling channels +By default this program will analyze all channels in the given audio file, if you are only interested in noe specific channel you can tell the program that via the `-m` flag: +``` +spectralyze -m 1 coolSong.wav +``` +will only analyze the first audio channel + +## Zero-padding +The FFT algorithm implemented here can only work if the number of samples is a power of 2. So by default, before performing the transformation, this program will zero-pad the signal until we reach such a sample size. Essentially, it appends a bunch of zeros to the end until it is a power of two. By using the `-p` flag you can go further than this. `-p 2` will tell the program to pad up until the power of two *after* the next one, essentially doubling the sample size. This results in a higher resolution in the frequency spectrum +``` +spectralyze -p 3 coolSong.wav +``` +This will tell the program to pad to the 3rd-next power of 2! This means, if the number if samples given is 100, it would pad it to 256 by default, and due to the `-p` switch all the way to 1024. + +**RESOLUTION (and thus file size) SCALES WITH 2^p** + +## Example command +``` +spectralyze -i 20 -f 0,1000 -p 3 coolSong.wav +``` +After the file coolSong.wav is read, the audio signal is split into 20ms long clips, which are then each individually given to the transformation function. + +Due to `-p 3`, the zero padding will go two powers of two higher than it normally would, essentially quadrupling output resolution. + +`-f 0,1000` will limit the outputted spectrum to a range between 0kHz and 1kHz + ## Supported Formats * WAV * AIFF From f71c0ec67efca444a0e151d713e812150410ad49 Mon Sep 17 00:00:00 2001 From: Lauchmelder Date: Thu, 29 Apr 2021 11:45:42 +0200 Subject: [PATCH 07/19] Update README.md --- README.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 83ce6d7..21ff76b 100644 --- a/README.md +++ b/README.md @@ -69,7 +69,13 @@ Each audio channel in the file is transformed separately. The resulting JSON has ``` Every supplied audio file will result in one JSON file. The magnitude is the absolute value of the real and imaginary part of the Fourier transformation. +## Example use case +This tool can theoretically be used to visualize music. The visualization part has to be written by you, though. For my little experiment I used python with matplotlib to create a line diagram from the spectra: + +https://user-images.githubusercontent.com/24511538/116532180-4218e300-a8e0-11eb-8914-6b3b50228e58.mp4 + + ## Used libraries * [AudioFile](https://github.com/adamstark/AudioFile) for loading audio files * [JSON for Modern C++](https://github.com/nlohmann/json) for writing JSON data -* [cxxopts](https://github.com/jarro2783/cxxopts) for parsing commandline arguments \ No newline at end of file +* [cxxopts](https://github.com/jarro2783/cxxopts) for parsing commandline arguments From ef770e3bb437a09b57f2f81675dfe04dfd5121a9 Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 29 Apr 2021 14:00:53 +0200 Subject: [PATCH 08/19] added window functions --- CMakeLists.txt | 2 +- README.md | 3 ++ src/FFT.cpp | 116 +++++++++++++++++++++++++++++++++++++++++++++++++ src/FFT.hpp | 90 ++++---------------------------------- src/main.cpp | 43 +++++++++++++++--- 5 files changed, 166 insertions(+), 88 deletions(-) create mode 100644 src/FFT.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index c4b65d2..0fecd2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ project(spectralyze) add_executable(spectralyze "src/main.cpp" - "src/FFT.hpp" + "src/FFT.hpp" "src/FFT.cpp" ) target_include_directories(spectralyze PRIVATE diff --git a/README.md b/README.md index 83ce6d7..66c7bed 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,9 @@ This will tell the program to pad to the 3rd-next power of 2! This means, if the **RESOLUTION (and thus file size) SCALES WITH 2^p** +## Window functions +Window functions are used to "cut out" parts of the signal. When you use the `-i` flag, you are only looking at a certain interval in the audio file. This is equivalent to multiplying the whole audio file with a rectangular window function (it is 0 everywhere except in the interval, where it is 1). With the `-w` flag you can choose between different window functions. Currently supported are the Von-Hann function, and the Gauss function. Both of these yield "smoother" spectra and get rid of a lot of noise. + ## Example command ``` spectralyze -i 20 -f 0,1000 -p 3 coolSong.wav diff --git a/src/FFT.cpp b/src/FFT.cpp new file mode 100644 index 0000000..021a5a7 --- /dev/null +++ b/src/FFT.cpp @@ -0,0 +1,116 @@ +#include "FFT.hpp" + +#define _USE_MATH_DEFINES +#include +#include +#include +#include + +#define POW_OF_TWO(x) (x && !(x & (x - 1))) + +using namespace std::complex_literals; + +typedef std::function WindowFunction; + +inline double WindowRectangle(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); + +std::vector> +radix2dit( + const std::vector& list, + size_t offset, + size_t N, + size_t s, + WindowFunction winFunc) +{ + std::vector> output(N); + if (N == 1) + { + output[0] = winFunc(offset) * (list[offset]); + } + else + { + size_t halfN = N >> 1; + std::vector> first = radix2dit(list, offset, halfN, s << 1, winFunc); + std::vector> second = radix2dit(list, offset + s, halfN, s << 1, winFunc); + + std::complex coeff = -M_PI * 1.0i / (double)halfN; + + for (int k = 0; k < halfN; k++) + { + std::complex p = first[k]; + std::complex q = std::exp(coeff * (double)k) * second[k]; + + output[k] = p + q; + output[halfN + k] = p - q; + } + } + + return output; +} + +std::vector> +FFT(const std::vector::const_iterator& begin, + const std::vector::const_iterator& end, + size_t sampleRate, + double minFreq, double maxFreq, + unsigned int zeropadding, + WindowFunctions func, unsigned int width, unsigned int offset) +{ + std::vector signal(begin, end); + size_t N = signal.size(); + while (!POW_OF_TWO(N)) + { + // Pad with zeros + signal.push_back(0.0f); + N++; + } + + if (zeropadding > 1) { + N = (signal.size() << (zeropadding - 1)); + signal.insert(signal.end(), N - signal.size(), 0); + } + + WindowFunction f; + switch (func) + { + case WindowFunctions::RECTANGLE: f = std::bind(WindowRectangle, std::placeholders::_1, offset, width); break; + case WindowFunctions::VON_HANN: f = std::bind(WindowVonHann, std::placeholders::_1, offset, width); break; + case WindowFunctions::GAUSS: f = std::bind(WindowGauss, std::placeholders::_1, offset, width); break; + } + + + std::vector> spectrum = radix2dit(signal, 0, N, 1, f); + double freqRes = (double)sampleRate / (double)N; + double nyquistLimit = (double)sampleRate / 2.0f; + + std::vector> output; + double freq = minFreq; + if (maxFreq == 0) + maxFreq = nyquistLimit; + + for (int k = freq / freqRes; freq < nyquistLimit && freq < maxFreq; k++) + { + output.push_back(std::make_pair(freq, 2.0f * std::abs(spectrum[k]) / (double)N)); + freq += freqRes; + } + + return output; +} + +inline double WindowRectangle(unsigned int k, unsigned int offset, unsigned int width) +{ + return ((offset < k) && (k < width)); +} + +inline double WindowVonHann(unsigned int k, unsigned int offset, unsigned int width) +{ + return ((offset < k) && (k < width)) ? (0.5f * (1.0f - cos(2.0f * M_PI * k / (width - 1)))) : 0; +} + +inline double WindowGauss(unsigned int k, unsigned int offset, unsigned int width) +{ + double coeff = (k - (width - 1) * 0.5f) / (0.4f * (width - 1) * 0.5f); + return ((offset < k) && (k < width)) ? (std::exp(-0.5f * coeff * coeff)) : 0; +} diff --git a/src/FFT.hpp b/src/FFT.hpp index 750100f..549d721 100644 --- a/src/FFT.hpp +++ b/src/FFT.hpp @@ -1,89 +1,17 @@ #pragma once -#define _USE_MATH_DEFINES -#include #include #include -#define TWO_PI (double)6.28318530718f -#define POW_OF_TWO(x) (x && !(x & (x - 1))) +enum class WindowFunctions { + RECTANGLE, + GAUSS, + VON_HANN +}; -using namespace std::complex_literals; - -std::vector> radix2dit(const std::vector::const_iterator& begin, size_t N, size_t s) -{ - std::vector> output(N); - if (N == 1) - { - output[0] = *begin; - } - else - { - size_t halfN = N >> 1; - std::vector> first = radix2dit(begin, halfN, s << 1); - std::vector> second = radix2dit(begin + s, halfN, s << 1); - - /*if (s == 1) { - std::future>> firstFuture = std::async(&radix2dit, begin, halfN, s << 1); - std::future>> secondFuture = std::async(&radix2dit, begin + s, halfN, s << 1); - - first = firstFuture.get(); - second = secondFuture.get(); - } - else { - first = radix2dit(begin, halfN, s << 1); - second = radix2dit(begin + 1, halfN, s << 1); - }*/ - - std::complex coeff = -M_PI * 1.0i / (double)halfN; - - for (int k = 0; k < N >> 1; k++) - { - std::complex p = first[k]; - std::complex q = std::exp(coeff * (double)k) * second[k]; - - output[k] = p + q; - output[halfN + k] = p - q; - } - } - - return output; -} - -std::vector> -FFT(const std::vector::const_iterator& begin, - const std::vector::const_iterator& end, +extern std::vector> FFT(const std::vector::const_iterator& begin, + const std::vector::const_iterator& end, size_t sampleRate, double minFreq, double maxFreq, - unsigned int zeropadding) -{ - std::vector signal(begin, end); - size_t N = signal.size(); - while (!POW_OF_TWO(N)) - { - // Pad with zeros - signal.push_back(0.0f); - N++; - } + unsigned int zeropadding, + WindowFunctions func, unsigned int width, unsigned int offset); - if (zeropadding > 1) { - N = (signal.size() << (zeropadding - 1)); - signal.insert(signal.end(), N - signal.size(), 0); - } - - std::vector> spectrum = radix2dit(signal.cbegin(), N, 1); - double freqRes = (double)sampleRate / (double)N; - double nyquistLimit = (double)sampleRate / 2.0f; - - std::vector> output; - double freq = minFreq; - if (maxFreq == 0) - maxFreq = nyquistLimit; - - for (int k = freq / freqRes; freq < nyquistLimit && freq < maxFreq; k++) - { - output.push_back(std::make_pair(freq, 2.0f * std::abs(spectrum[k]) / (double)N)); - freq += freqRes; - } - - return output; -} diff --git a/src/main.cpp b/src/main.cpp index 392824f..99f4b30 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include #include "AudioFile.h" @@ -10,6 +11,12 @@ #define PRINTER(s, x) if(!s.quiet) { std::cout << x; } +const std::map FUNCTIONS { + {"rectangle", WindowFunctions::RECTANGLE}, + {"von-hann", WindowFunctions::VON_HANN}, + {"gauss", WindowFunctions::GAUSS} +}; + struct Settings { std::vector files; bool quiet; @@ -17,6 +24,7 @@ struct Settings { double minFreq, maxFreq; unsigned int analyzeChannel; unsigned int zeropadding; + WindowFunctions window; }; Settings Parse(int argc, char** argv); @@ -61,7 +69,8 @@ int main(int argc, char** argv) audioFile.samples[c-1].cend(), sampleRate, setts.minFreq, setts.maxFreq, - setts.zeropadding + setts.zeropadding, + setts.window, audioFile.samples[c-1].size(), 0 ); output[chName] = nlohmann::json::array(); @@ -77,14 +86,15 @@ int main(int argc, char** argv) { std::vector> spectrum = FFT( - audioFile.samples[c-1].cbegin() + currentSample, + audioFile.samples[c - 1].cbegin() + currentSample, std::min( - audioFile.samples[c-1].cbegin() + currentSample + sampleInterval, - audioFile.samples[c-1].cend() - ), + audioFile.samples[c - 1].cbegin() + currentSample + sampleInterval, + audioFile.samples[c - 1].cend() + ), sampleRate, setts.minFreq, setts.maxFreq, - setts.zeropadding + setts.zeropadding, + setts.window, sampleInterval, 0 ); output[chName].push_back({ @@ -127,6 +137,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()) ("f,frequency", "Defines the frequency range of the output spectrum (Default: all the frequencies)", cxxopts::value>()) ("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()) + ("w,window", "Specify the window function used (rectangle (default), von-hann, gauss)", cxxopts::value()->default_value("rectangle")) ("m,mono", "Analyze only the given channel", cxxopts::value()->default_value("0")) ("files", "Files to fourier transform", cxxopts::value>()) ("h,help", "Print usage") @@ -163,6 +174,26 @@ Settings Parse(int argc, char** argv) setts.splitInterval = (result.count("interval") ? result["interval"].as() : 0.0f); setts.analyzeChannel = (result.count("mono") ? result["mono"].as() : 0); setts.zeropadding = (result.count("pad") ? result["pad"].as() : 1); + + if (!result.count("window")) + { + setts.window = WindowFunctions::RECTANGLE; + } + else + { + std::string data = result["window"].as(); + std::transform(data.begin(), data.end(), data.begin(), [](unsigned char c) { return std::tolower(c); }); + auto it = FUNCTIONS.find(data); + if (it == FUNCTIONS.end()) + { + setts.window = WindowFunctions::RECTANGLE; + } + else + { + setts.window = it->second; + } + + } if (setts.maxFreq <= setts.minFreq && (setts.maxFreq != 0)) From c903658f6527ea4b137dafb0697e877e64d636dd Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 29 Apr 2021 17:14:29 +0200 Subject: [PATCH 09/19] added triangle window --- src/FFT.cpp | 40 ++++++++++++++++++++++++++-------------- src/FFT.hpp | 7 ++++--- src/main.cpp | 13 +++++++------ 3 files changed, 37 insertions(+), 23 deletions(-) diff --git a/src/FFT.cpp b/src/FFT.cpp index 021a5a7..76e2557 100644 --- a/src/FFT.cpp +++ b/src/FFT.cpp @@ -12,28 +12,30 @@ using namespace std::complex_literals; typedef std::function WindowFunction; +static WindowFunction window; + inline double WindowRectangle(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 WindowTriangle(unsigned int k, unsigned int offset, unsigned int width); std::vector> radix2dit( const std::vector& list, size_t offset, size_t N, - size_t s, - WindowFunction winFunc) + size_t s) { std::vector> output(N); if (N == 1) { - output[0] = winFunc(offset) * (list[offset]); + output[0] = window(offset) * (list[offset]); } else { size_t halfN = N >> 1; - std::vector> first = radix2dit(list, offset, halfN, s << 1, winFunc); - std::vector> second = radix2dit(list, offset + s, halfN, s << 1, winFunc); + std::vector> first = radix2dit(list, offset, halfN, s << 1); + std::vector> second = radix2dit(list, offset + s, halfN, s << 1); std::complex coeff = -M_PI * 1.0i / (double)halfN; @@ -55,8 +57,7 @@ FFT(const std::vector::const_iterator& begin, const std::vector::const_iterator& end, size_t sampleRate, double minFreq, double maxFreq, - unsigned int zeropadding, - WindowFunctions func, unsigned int width, unsigned int offset) + unsigned int zeropadding) { std::vector signal(begin, end); size_t N = signal.size(); @@ -73,15 +74,10 @@ FFT(const std::vector::const_iterator& begin, } WindowFunction f; - switch (func) - { - case WindowFunctions::RECTANGLE: f = std::bind(WindowRectangle, std::placeholders::_1, offset, width); break; - case WindowFunctions::VON_HANN: f = std::bind(WindowVonHann, std::placeholders::_1, offset, width); break; - case WindowFunctions::GAUSS: f = std::bind(WindowGauss, std::placeholders::_1, offset, width); break; - } + - std::vector> spectrum = radix2dit(signal, 0, N, 1, f); + std::vector> spectrum = radix2dit(signal, 0, N, 1); double freqRes = (double)sampleRate / (double)N; double nyquistLimit = (double)sampleRate / 2.0f; @@ -99,6 +95,17 @@ FFT(const std::vector::const_iterator& begin, return output; } +void SetWindowFunction(WindowFunctions func, unsigned int width) +{ + switch (func) + { + case WindowFunctions::RECTANGLE: window = std::bind(WindowRectangle, 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::TRIANGLE: window = std::bind(WindowTriangle, std::placeholders::_1, 0, width); break; + } +} + inline double WindowRectangle(unsigned int k, unsigned int offset, unsigned int width) { return ((offset < k) && (k < width)); @@ -114,3 +121,8 @@ inline double WindowGauss(unsigned int k, unsigned int offset, unsigned int widt double coeff = (k - (width - 1) * 0.5f) / (0.4f * (width - 1) * 0.5f); return ((offset < k) && (k < width)) ? (std::exp(-0.5f * coeff * coeff)) : 0; } + +inline double WindowTriangle(unsigned int k, unsigned int offset, unsigned int width) +{ + return 1.0f - std::abs(((double)k - ((double)width / 2.0f)) / ((double)width / 2.0f)); +} diff --git a/src/FFT.hpp b/src/FFT.hpp index 549d721..f7d8ad3 100644 --- a/src/FFT.hpp +++ b/src/FFT.hpp @@ -5,13 +5,14 @@ enum class WindowFunctions { RECTANGLE, GAUSS, - VON_HANN + VON_HANN, + TRIANGLE }; extern std::vector> FFT(const std::vector::const_iterator& begin, const std::vector::const_iterator& end, size_t sampleRate, double minFreq, double maxFreq, - unsigned int zeropadding, - WindowFunctions func, unsigned int width, unsigned int offset); + unsigned int zeropadding); +extern void SetWindowFunction(WindowFunctions func, unsigned int width); \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 99f4b30..17ddd2a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -14,7 +14,8 @@ const std::map FUNCTIONS { {"rectangle", WindowFunctions::RECTANGLE}, {"von-hann", WindowFunctions::VON_HANN}, - {"gauss", WindowFunctions::GAUSS} + {"gauss", WindowFunctions::GAUSS}, + {"triangle", WindowFunctions::TRIANGLE} }; struct Settings { @@ -63,14 +64,14 @@ int main(int argc, char** argv) if (setts.splitInterval == 0.0f) { + SetWindowFunction(setts.window, audioFile.samples[c-1].size()); std::vector> spectrum = FFT( audioFile.samples[c-1].cbegin(), audioFile.samples[c-1].cend(), sampleRate, setts.minFreq, setts.maxFreq, - setts.zeropadding, - setts.window, audioFile.samples[c-1].size(), 0 + setts.zeropadding ); output[chName] = nlohmann::json::array(); @@ -81,6 +82,7 @@ int main(int argc, char** argv) else { int sampleInterval = sampleRate * setts.splitInterval / 1000; + SetWindowFunction(setts.window, sampleInterval); int currentSample; for (currentSample = 0; currentSample < audioFile.samples[c - 1].size(); currentSample += sampleInterval) { @@ -93,8 +95,7 @@ int main(int argc, char** argv) ), sampleRate, setts.minFreq, setts.maxFreq, - setts.zeropadding, - setts.window, sampleInterval, 0 + setts.zeropadding ); output[chName].push_back({ @@ -137,7 +138,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()) ("f,frequency", "Defines the frequency range of the output spectrum (Default: all the frequencies)", cxxopts::value>()) ("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()) - ("w,window", "Specify the window function used (rectangle (default), von-hann, gauss)", cxxopts::value()->default_value("rectangle")) + ("w,window", "Specify the window function used (rectangle (default), von-hann, gauss, triangle)", cxxopts::value()->default_value("rectangle")) ("m,mono", "Analyze only the given channel", cxxopts::value()->default_value("0")) ("files", "Files to fourier transform", cxxopts::value>()) ("h,help", "Print usage") From 291b985bc3fd0d2c308074573a6bee5dc8832ae2 Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 29 Apr 2021 17:25:35 +0200 Subject: [PATCH 10/19] added blackman harris --- src/FFT.cpp | 7 +++++++ src/FFT.hpp | 3 ++- src/main.cpp | 5 +++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/FFT.cpp b/src/FFT.cpp index 76e2557..2171da9 100644 --- a/src/FFT.cpp +++ b/src/FFT.cpp @@ -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 WindowGauss(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> 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::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::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)); } + +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)); +} diff --git a/src/FFT.hpp b/src/FFT.hpp index f7d8ad3..0a04842 100644 --- a/src/FFT.hpp +++ b/src/FFT.hpp @@ -6,7 +6,8 @@ enum class WindowFunctions { RECTANGLE, GAUSS, VON_HANN, - TRIANGLE + TRIANGLE, + BLACKMAN }; extern std::vector> FFT(const std::vector::const_iterator& begin, diff --git a/src/main.cpp b/src/main.cpp index 17ddd2a..8daff5a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -15,7 +15,8 @@ const std::map FUNCTIONS { {"rectangle", WindowFunctions::RECTANGLE}, {"von-hann", WindowFunctions::VON_HANN}, {"gauss", WindowFunctions::GAUSS}, - {"triangle", WindowFunctions::TRIANGLE} + {"triangle", WindowFunctions::TRIANGLE}, + {"blackman", WindowFunctions::BLACKMAN} }; 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()) ("f,frequency", "Defines the frequency range of the output spectrum (Default: all the frequencies)", cxxopts::value>()) ("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()) - ("w,window", "Specify the window function used (rectangle (default), von-hann, gauss, triangle)", cxxopts::value()->default_value("rectangle")) + ("w,window", "Specify the window function used (rectangle (default), von-hann, gauss, triangle, blackman (3-term))", cxxopts::value()->default_value("rectangle")) ("m,mono", "Analyze only the given channel", cxxopts::value()->default_value("0")) ("files", "Files to fourier transform", cxxopts::value>()) ("h,help", "Print usage") From f2ad3bd04ab96b57097e8c5c10896533799db89d Mon Sep 17 00:00:00 2001 From: Robert Date: Thu, 29 Apr 2021 23:21:52 +0200 Subject: [PATCH 11/19] added mertz method --- src/FFT.cpp | 9 +++++++-- src/FFT.hpp | 3 ++- src/main.cpp | 9 +++++++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/FFT.cpp b/src/FFT.cpp index 2171da9..140e334 100644 --- a/src/FFT.cpp +++ b/src/FFT.cpp @@ -58,7 +58,8 @@ FFT(const std::vector::const_iterator& begin, const std::vector::const_iterator& end, size_t sampleRate, double minFreq, double maxFreq, - unsigned int zeropadding) + unsigned int zeropadding, + bool mertz) { std::vector signal(begin, end); size_t N = signal.size(); @@ -89,7 +90,11 @@ FFT(const std::vector::const_iterator& begin, for (int k = freq / freqRes; freq < nyquistLimit && freq < maxFreq; k++) { - output.push_back(std::make_pair(freq, 2.0f * std::abs(spectrum[k]) / (double)N)); + if(!mertz) + 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; } diff --git a/src/FFT.hpp b/src/FFT.hpp index 0a04842..25c0e8f 100644 --- a/src/FFT.hpp +++ b/src/FFT.hpp @@ -14,6 +14,7 @@ extern std::vector> FFT(const std::vector::con const std::vector::const_iterator& end, size_t sampleRate, double minFreq, double maxFreq, - unsigned int zeropadding); + unsigned int zeropadding, + bool mertz); extern void SetWindowFunction(WindowFunctions func, unsigned int width); \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 8daff5a..0e76896 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -26,6 +26,7 @@ struct Settings { double minFreq, maxFreq; unsigned int analyzeChannel; unsigned int zeropadding; + bool mertz; WindowFunctions window; }; @@ -72,7 +73,8 @@ int main(int argc, char** argv) audioFile.samples[c-1].cend(), sampleRate, setts.minFreq, setts.maxFreq, - setts.zeropadding + setts.zeropadding, + setts.mertz ); output[chName] = nlohmann::json::array(); @@ -96,7 +98,8 @@ int main(int argc, char** argv) ), sampleRate, setts.minFreq, setts.maxFreq, - setts.zeropadding + setts.zeropadding, + setts.mertz ); output[chName].push_back({ @@ -140,6 +143,7 @@ Settings Parse(int argc, char** argv) ("f,frequency", "Defines the frequency range of the output spectrum (Default: all the frequencies)", cxxopts::value>()) ("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()) ("w,window", "Specify the window function used (rectangle (default), von-hann, gauss, triangle, blackman (3-term))", cxxopts::value()->default_value("rectangle")) + ("mertz", "Use the Mertz method to phase-correct the complex Fourier spectrum") ("m,mono", "Analyze only the given channel", cxxopts::value()->default_value("0")) ("files", "Files to fourier transform", cxxopts::value>()) ("h,help", "Print usage") @@ -176,6 +180,7 @@ Settings Parse(int argc, char** argv) setts.splitInterval = (result.count("interval") ? result["interval"].as() : 0.0f); setts.analyzeChannel = (result.count("mono") ? result["mono"].as() : 0); setts.zeropadding = (result.count("pad") ? result["pad"].as() : 1); + setts.mertz = (result.count("mertz") ? true : false); if (!result.count("window")) { From 0f22f865e43147b1ed23a9664ee3cd5a55304807 Mon Sep 17 00:00:00 2001 From: Lauchmelder Date: Thu, 29 Apr 2021 23:26:09 +0200 Subject: [PATCH 12/19] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c85feaf..e8b5513 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,7 @@ This tool can theoretically be used to visualize music. The visualization part h https://user-images.githubusercontent.com/24511538/116532180-4218e300-a8e0-11eb-8914-6b3b50228e58.mp4 +Visualization written by [mpsparrow](https://github.com/mpsparrow) ## Used libraries * [AudioFile](https://github.com/adamstark/AudioFile) for loading audio files From 0609fe6c3393983ab012c31005ae736274cefa77 Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 30 Apr 2021 11:36:18 +0200 Subject: [PATCH 13/19] removed mertz --- src/FFT.cpp | 8 ++------ src/FFT.hpp | 3 +-- src/main.cpp | 9 ++------- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/FFT.cpp b/src/FFT.cpp index 140e334..6291fb8 100644 --- a/src/FFT.cpp +++ b/src/FFT.cpp @@ -58,8 +58,7 @@ FFT(const std::vector::const_iterator& begin, const std::vector::const_iterator& end, size_t sampleRate, double minFreq, double maxFreq, - unsigned int zeropadding, - bool mertz) + unsigned int zeropadding) { std::vector signal(begin, end); size_t N = signal.size(); @@ -90,10 +89,7 @@ FFT(const std::vector::const_iterator& begin, 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)); - else - output.push_back(std::make_pair(freq, 2.0f * (spectrum[k] * std::exp(-1i * std::arg(spectrum[k]))).real() / (double)N)); + output.push_back(std::make_pair(freq, 2.0f * std::abs(spectrum[k]) / (double)N)); freq += freqRes; } diff --git a/src/FFT.hpp b/src/FFT.hpp index 25c0e8f..0a04842 100644 --- a/src/FFT.hpp +++ b/src/FFT.hpp @@ -14,7 +14,6 @@ extern std::vector> FFT(const std::vector::con const std::vector::const_iterator& end, size_t sampleRate, double minFreq, double maxFreq, - unsigned int zeropadding, - bool mertz); + unsigned int zeropadding); extern void SetWindowFunction(WindowFunctions func, unsigned int width); \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 0e76896..8daff5a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -26,7 +26,6 @@ struct Settings { double minFreq, maxFreq; unsigned int analyzeChannel; unsigned int zeropadding; - bool mertz; WindowFunctions window; }; @@ -73,8 +72,7 @@ int main(int argc, char** argv) audioFile.samples[c-1].cend(), sampleRate, setts.minFreq, setts.maxFreq, - setts.zeropadding, - setts.mertz + setts.zeropadding ); output[chName] = nlohmann::json::array(); @@ -98,8 +96,7 @@ int main(int argc, char** argv) ), sampleRate, setts.minFreq, setts.maxFreq, - setts.zeropadding, - setts.mertz + setts.zeropadding ); 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>()) ("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()) ("w,window", "Specify the window function used (rectangle (default), von-hann, gauss, triangle, blackman (3-term))", cxxopts::value()->default_value("rectangle")) - ("mertz", "Use the Mertz method to phase-correct the complex Fourier spectrum") ("m,mono", "Analyze only the given channel", cxxopts::value()->default_value("0")) ("files", "Files to fourier transform", cxxopts::value>()) ("h,help", "Print usage") @@ -180,7 +176,6 @@ Settings Parse(int argc, char** argv) setts.splitInterval = (result.count("interval") ? result["interval"].as() : 0.0f); setts.analyzeChannel = (result.count("mono") ? result["mono"].as() : 0); setts.zeropadding = (result.count("pad") ? result["pad"].as() : 1); - setts.mertz = (result.count("mertz") ? true : false); if (!result.count("window")) { From bb947b4a53d61bfbd2676ce4d9aee2654ecd2081 Mon Sep 17 00:00:00 2001 From: Robert Date: Fri, 30 Apr 2021 13:25:09 +0200 Subject: [PATCH 14/19] added trigonometric approximations --- src/FFT.cpp | 60 ++++++++++++++++++++++++++++++++++++++++++++++------ src/FFT.hpp | 3 ++- src/main.cpp | 6 ++++++ 3 files changed, 62 insertions(+), 7 deletions(-) diff --git a/src/FFT.cpp b/src/FFT.cpp index 6291fb8..f3895ef 100644 --- a/src/FFT.cpp +++ b/src/FFT.cpp @@ -8,11 +8,24 @@ #define POW_OF_TWO(x) (x && !(x & (x - 1))) +constexpr double REC_2_FAC = (double)1.0f / (double)2.0f; +constexpr double REC_3_FAC = (double)1.0f / (double)6.0f; +constexpr double REC_4_FAC = (double)1.0f / (double)24.0f; +constexpr double REC_5_FAC = (double)1.0f / (double)120.0f; +constexpr double REC_6_FAC = (double)1.0f / (double)720.0f; +constexpr double REC_7_FAC = (double)1.0f / (double)5040.0f; +constexpr double REC_8_FAC = (double)1.0f / (double)40320.0f; +constexpr double REC_9_FAC = (double)1.0f / (double)362880.0f; + using namespace std::complex_literals; typedef std::function WindowFunction; +typedef std::function TrigFunction; +typedef std::function(double)> ExpFunction; -static WindowFunction window; +WindowFunction window; +TrigFunction Sin = std::bind((double(*)(double))& std::sin, std::placeholders::_1); +TrigFunction Cos = std::bind((double(*)(double))& std::cos, std::placeholders::_1); inline double WindowRectangle(unsigned int k, unsigned int offset, unsigned int width); inline double WindowVonHann(unsigned int k, unsigned int offset, unsigned int width); @@ -20,6 +33,10 @@ inline double WindowGauss(unsigned int k, unsigned int offset, unsigned int widt inline double WindowTriangle(unsigned int k, unsigned int offset, unsigned int width); inline double WindowBlackman(unsigned int k, unsigned int offset, unsigned int width); +double FastCos(double x); +double FastSin(double x); +std::complex ComplexExp(double x); + std::vector> radix2dit( const std::vector& list, @@ -38,12 +55,12 @@ radix2dit( std::vector> first = radix2dit(list, offset, halfN, s << 1); std::vector> second = radix2dit(list, offset + s, halfN, s << 1); - std::complex coeff = -M_PI * 1.0i / (double)halfN; + double coeff = -M_PI / (double)halfN; for (int k = 0; k < halfN; k++) { std::complex p = first[k]; - std::complex q = std::exp(coeff * (double)k) * second[k]; + std::complex q = ComplexExp(coeff * (double)k) * second[k]; output[k] = p + q; output[halfN + k] = p - q; @@ -76,7 +93,7 @@ FFT(const std::vector::const_iterator& begin, WindowFunction f; - + std::vector> spectrum = radix2dit(signal, 0, N, 1); double freqRes = (double)sampleRate / (double)N; @@ -109,6 +126,12 @@ void SetWindowFunction(WindowFunctions func, unsigned int width) } } +void UseFastFunctions() +{ + Sin = std::bind(FastSin, std::placeholders::_1); + Cos = std::bind(FastCos, std::placeholders::_1); +} + inline double WindowRectangle(unsigned int k, unsigned int offset, unsigned int width) { return ((offset < k) && (k < width)); @@ -116,7 +139,7 @@ inline double WindowRectangle(unsigned int k, unsigned int offset, unsigned int inline double WindowVonHann(unsigned int k, unsigned int offset, unsigned int width) { - return ((offset < k) && (k < width)) ? (0.5f * (1.0f - cos(2.0f * M_PI * k / (width - 1)))) : 0; + return ((offset < k) && (k < width)) ? (0.5f * (1.0f - Cos(2.0f * M_PI * k / (width - 1)))) : 0; } inline double WindowGauss(unsigned int k, unsigned int offset, unsigned int width) @@ -132,5 +155,30 @@ inline double WindowTriangle(unsigned int k, unsigned int offset, unsigned int w 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)); + return (double)0.5f * ((double)1.0f - (double)0.16f) - 0.5f * Cos(2.0f * M_PI * k / (width - 1)) + (double)0.5f * (double)0.16f * Cos(4.0f * M_PI * k / (width - 1)); +} + +double FastCos(double x) +{ + x -= (x > M_PI) * (double)2.0f * M_PI; + x += (x < -M_PI) * (double)2.0f * M_PI; + double xpow2 = x * x; + double xpow4 = xpow2 * x * x; + double xpow6 = xpow4 * x * x; + return (double)1.0f - xpow2 * REC_2_FAC + xpow4 * REC_4_FAC - xpow6 * REC_6_FAC + xpow6 * x * x * REC_8_FAC; +} + +double FastSin(double x) +{ + x -= (x > M_PI) * (double)2.0f * M_PI; + x += (x < -M_PI) * (double)2.0f * M_PI; + double xpow3 = x * x * x; + double xpow5 = xpow3 * x * x; + double xpow7 = xpow5 * x * x; + return (double)x - xpow3 * REC_3_FAC + xpow5 * REC_5_FAC - xpow7 * REC_7_FAC + xpow7 * x * x * REC_9_FAC; +} + +std::complex ComplexExp(double x) +{ + return std::complex(Cos(x), Sin(x)); } diff --git a/src/FFT.hpp b/src/FFT.hpp index 0a04842..6417fd6 100644 --- a/src/FFT.hpp +++ b/src/FFT.hpp @@ -16,4 +16,5 @@ extern std::vector> FFT(const std::vector::con double minFreq, double maxFreq, unsigned int zeropadding); -extern void SetWindowFunction(WindowFunctions func, unsigned int width); \ No newline at end of file +extern void SetWindowFunction(WindowFunctions func, unsigned int width); +extern void UseFastFunctions(); \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index 8daff5a..6fcd617 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -26,6 +26,7 @@ struct Settings { double minFreq, maxFreq; unsigned int analyzeChannel; unsigned int zeropadding; + bool approx; WindowFunctions window; }; @@ -36,6 +37,9 @@ int main(int argc, char** argv) Settings setts; setts = Parse(argc, argv); + if (setts.approx) + UseFastFunctions(); + int numFiles = setts.files.size(); for (auto& file : setts.files) { AudioFile audioFile; @@ -141,6 +145,7 @@ Settings Parse(int argc, char** argv) ("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()) ("w,window", "Specify the window function used (rectangle (default), von-hann, gauss, triangle, blackman (3-term))", cxxopts::value()->default_value("rectangle")) ("m,mono", "Analyze only the given channel", cxxopts::value()->default_value("0")) + ("approx", "Use faster, but more inaccurate trigonometric functions instead of the std-functions (EXPERIMENTAL)") ("files", "Files to fourier transform", cxxopts::value>()) ("h,help", "Print usage") ; @@ -176,6 +181,7 @@ Settings Parse(int argc, char** argv) setts.splitInterval = (result.count("interval") ? result["interval"].as() : 0.0f); setts.analyzeChannel = (result.count("mono") ? result["mono"].as() : 0); setts.zeropadding = (result.count("pad") ? result["pad"].as() : 1); + setts.approx = (result.count("approx") ? true : false); if (!result.count("window")) { From 56bc0e752dea9aeeb009b49a1767324758b4298b Mon Sep 17 00:00:00 2001 From: Lauchmelder Date: Fri, 30 Apr 2021 13:26:43 +0200 Subject: [PATCH 15/19] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e8b5513..9f2cb50 100644 --- a/README.md +++ b/README.md @@ -75,7 +75,7 @@ Every supplied audio file will result in one JSON file. The magnitude is the abs ## Example use case This tool can theoretically be used to visualize music. The visualization part has to be written by you, though. For my little experiment I used python with matplotlib to create a line diagram from the spectra: -https://user-images.githubusercontent.com/24511538/116532180-4218e300-a8e0-11eb-8914-6b3b50228e58.mp4 +https://user-images.githubusercontent.com/24511538/116688886-a22e8880-a9b7-11eb-9a3d-b9b5069de697.mp4 Visualization written by [mpsparrow](https://github.com/mpsparrow) From 7cd64b62225551b9241aa1b972fd92fd73ea9a8a Mon Sep 17 00:00:00 2001 From: Lauchmelder Date: Fri, 30 Apr 2021 17:48:01 +0200 Subject: [PATCH 16/19] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 9f2cb50..a20b8cb 100644 --- a/README.md +++ b/README.md @@ -75,6 +75,10 @@ Every supplied audio file will result in one JSON file. The magnitude is the abs ## Example use case This tool can theoretically be used to visualize music. The visualization part has to be written by you, though. For my little experiment I used python with matplotlib to create a line diagram from the spectra: + +https://user-images.githubusercontent.com/24511538/116720172-2d217a00-a9dc-11eb-945f-5db40300da78.mp4 + + https://user-images.githubusercontent.com/24511538/116688886-a22e8880-a9b7-11eb-9a3d-b9b5069de697.mp4 Visualization written by [mpsparrow](https://github.com/mpsparrow) From ec7f291194fc8097f5db15d03e96a4790a4957fa Mon Sep 17 00:00:00 2001 From: Lauchmelder Date: Wed, 23 Jun 2021 13:34:53 +0200 Subject: [PATCH 17/19] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a20b8cb..3926af0 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ By default, spectralyze will output the entire frequency spectrum, all the way u ``` spectralyze -f 0,2500 coolSong.wav ``` -This command would only output frequencies ranging from 0kHz-2kHz, greatly decreasing file size. +This command would only output frequencies ranging from 0kHz-2.5kHz, greatly decreasing file size. ## Disabling channels By default this program will analyze all channels in the given audio file, if you are only interested in noe specific channel you can tell the program that via the `-m` flag: From 9558264b5a01bfdabe486640b5b4801cdc415006 Mon Sep 17 00:00:00 2001 From: Lauchmelder Date: Sun, 19 Dec 2021 21:56:53 +0100 Subject: [PATCH 18/19] changed json file structure to be more space efficient --- src/main.cpp | 42 +++++++++++++++++++++++++++++++++++------- 1 file changed, 35 insertions(+), 7 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index 6fcd617..f70a20f 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -26,7 +26,7 @@ struct Settings { double minFreq, maxFreq; unsigned int analyzeChannel; unsigned int zeropadding; - bool approx; + bool approx, legacy; WindowFunctions window; }; @@ -40,6 +40,34 @@ int main(int argc, char** argv) if (setts.approx) UseFastFunctions(); + std::function>&)> toJson; + if (setts.legacy) + { + toJson = [](nlohmann::json& target, const std::vector>& spectrum) + { + target.push_back({ "spectrum", nlohmann::json::array()}); + + for (const std::pair& pair : spectrum) { + target["spectrum"].push_back({{"freq", pair.first}, {"mag", pair.second}}); + } + }; + } + else + { + toJson = [](nlohmann::json& target, const std::vector>& spectrum) + { + target.push_back({ "spectrum", { + { "freqs", nlohmann::json::array() }, + { "mags", nlohmann::json::array() } + } }); + + for (const std::pair& pair : spectrum) { + target["spectrum"]["freqs"].push_back(pair.first); + target["spectrum"]["mags"].push_back(pair.second); + } + }; + } + int numFiles = setts.files.size(); for (auto& file : setts.files) { AudioFile audioFile; @@ -105,21 +133,19 @@ int main(int argc, char** argv) output[chName].push_back({ {"begin", currentSample}, - {"end", currentSample + sampleInterval}, - {"spectrum", nlohmann::json::array()} + {"end", currentSample + sampleInterval} }); - for (const std::pair& pair : spectrum) { - output[chName].back()["spectrum"].push_back({ {"freq", pair.first}, {"mag", pair.second } }); - } + toJson(output[chName].back(), spectrum); PRINTER(setts, "\rAnalyzing " << filename << "... Channel " << c << "/" << numChannels << " " << (int)std::floor((float)currentSample / (float)audioFile.samples[c-1].size() * 100.0f) << "% "); + // std::cout << "sdfjkhsjd" << std::endl; } } } std::ofstream ofs(file.replace_extension("json")); - ofs << std::setw(4) << output << std::endl; + ofs << std::setw(4) << output.dump() << std::endl; ofs.close(); PRINTER(setts, "\rAnalyzing " << filename << "... 100% " << std::endl); @@ -147,6 +173,7 @@ Settings Parse(int argc, char** argv) ("m,mono", "Analyze only the given channel", cxxopts::value()->default_value("0")) ("approx", "Use faster, but more inaccurate trigonometric functions instead of the std-functions (EXPERIMENTAL)") ("files", "Files to fourier transform", cxxopts::value>()) + ("legacy", "Uses the legacy data structure (WHICH IS VERY BAD!)", cxxopts::value()->default_value("false")) ("h,help", "Print usage") ; @@ -182,6 +209,7 @@ Settings Parse(int argc, char** argv) setts.analyzeChannel = (result.count("mono") ? result["mono"].as() : 0); setts.zeropadding = (result.count("pad") ? result["pad"].as() : 1); setts.approx = (result.count("approx") ? true : false); + setts.legacy = (result.count("legacy") ? result["legacy"].as() : false); if (!result.count("window")) { From d3f71641f14a2282ad81da28e9a6e2791638fc07 Mon Sep 17 00:00:00 2001 From: Lauchmelder Date: Sun, 19 Dec 2021 22:39:13 +0100 Subject: [PATCH 19/19] further reduced output file size --- src/main.cpp | 69 ++++++++++++++++++++-------------------------------- 1 file changed, 27 insertions(+), 42 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index f70a20f..860b00e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -56,14 +56,10 @@ int main(int argc, char** argv) { toJson = [](nlohmann::json& target, const std::vector>& spectrum) { - target.push_back({ "spectrum", { - { "freqs", nlohmann::json::array() }, - { "mags", nlohmann::json::array() } - } }); + target.push_back({ "spectrum", nlohmann::json::array() }); for (const std::pair& pair : spectrum) { - target["spectrum"]["freqs"].push_back(pair.first); - target["spectrum"]["mags"].push_back(pair.second); + target["spectrum"].push_back(pair.second); } }; } @@ -83,6 +79,9 @@ int main(int argc, char** argv) int numChannels = audioFile.getNumChannels(); nlohmann::json output; + if(!setts.legacy) + output["freqs"] = nlohmann::json::array(); + int c = setts.analyzeChannel; if (c == 0) c = 1; @@ -95,52 +94,38 @@ int main(int argc, char** argv) std::string chName = "channel_" + std::to_string(c); output[chName] = nlohmann::json::array(); - if (setts.splitInterval == 0.0f) + int sampleInterval = (setts.splitInterval > 0.0f ? sampleRate * setts.splitInterval / 1000 : audioFile.samples[c - 1].size()); + SetWindowFunction(setts.window, sampleInterval); + int currentSample; + for (currentSample = 0; currentSample < audioFile.samples[c - 1].size(); currentSample += sampleInterval) { - SetWindowFunction(setts.window, audioFile.samples[c-1].size()); std::vector> spectrum = FFT( - audioFile.samples[c-1].cbegin(), - audioFile.samples[c-1].cend(), + audioFile.samples[c - 1].cbegin() + currentSample, + std::min( + audioFile.samples[c - 1].cbegin() + currentSample + sampleInterval, + audioFile.samples[c - 1].cend() + ), sampleRate, setts.minFreq, setts.maxFreq, setts.zeropadding ); - output[chName] = nlohmann::json::array(); - for (const std::pair& pair : spectrum) { - output[chName].push_back({ {"freq", pair.first}, {"mag", pair.second } }); - } - } - else - { - int sampleInterval = sampleRate * setts.splitInterval / 1000; - SetWindowFunction(setts.window, sampleInterval); - int currentSample; - for (currentSample = 0; currentSample < audioFile.samples[c - 1].size(); currentSample += sampleInterval) + if (!setts.legacy && output["freqs"].empty()) { - std::vector> spectrum = - FFT( - audioFile.samples[c - 1].cbegin() + currentSample, - std::min( - audioFile.samples[c - 1].cbegin() + currentSample + sampleInterval, - audioFile.samples[c - 1].cend() - ), - sampleRate, - setts.minFreq, setts.maxFreq, - setts.zeropadding - ); - - output[chName].push_back({ - {"begin", currentSample}, - {"end", currentSample + sampleInterval} - }); - - toJson(output[chName].back(), spectrum); - - PRINTER(setts, "\rAnalyzing " << filename << "... Channel " << c << "/" << numChannels << " " << (int)std::floor((float)currentSample / (float)audioFile.samples[c-1].size() * 100.0f) << "% "); - // std::cout << "sdfjkhsjd" << std::endl; + for (const std::pair& pair : spectrum) { + output["freqs"].push_back(pair.first); + } } + + output[chName].push_back({ + {"begin", currentSample}, + {"end", currentSample + sampleInterval} + }); + + toJson(output[chName].back(), spectrum); + + PRINTER(setts, "\rAnalyzing " << filename << "... Channel " << c << "/" << numChannels << " " << (int)std::floor((float)currentSample / (float)audioFile.samples[c-1].size() * 100.0f) << "% "); } }