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

changed json file structure to be more space efficient

Browse source
This commit is contained in:
Lauchmelder 2021-12-19 21:56:53 +01:00
parent ec7f291194
commit 9558264b5a
1 changed files with 35 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/main.cpp
View file

@ -26,7 +26,7 @@ struct Settings {
double minFreq, maxFreq; double minFreq, maxFreq;
unsigned int analyzeChannel; unsigned int analyzeChannel;
unsigned int zeropadding; unsigned int zeropadding;
bool approx; bool approx, legacy;
WindowFunctions window; WindowFunctions window;
}; };
@ -40,6 +40,34 @@ int main(int argc, char** argv)
if (setts.approx) if (setts.approx)
UseFastFunctions(); UseFastFunctions();
std::function<void(nlohmann::json&, const std::vector<std::pair<double, double>>&)> toJson;
if (setts.legacy)
{
toJson = [](nlohmann::json& target, const std::vector<std::pair<double, double>>& spectrum)
{
target.push_back({ "spectrum", nlohmann::json::array()});
for (const std::pair<double, double>& pair : spectrum) {
target["spectrum"].push_back({{"freq", pair.first}, {"mag", pair.second}});
}
};
}
else
{
toJson = [](nlohmann::json& target, const std::vector<std::pair<double, double>>& spectrum)
{
target.push_back({ "spectrum", {
{ "freqs", nlohmann::json::array() },
{ "mags", nlohmann::json::array() }
} });
for (const std::pair<double, double>& pair : spectrum) {
target["spectrum"]["freqs"].push_back(pair.first);
target["spectrum"]["mags"].push_back(pair.second);
}
};
}
int numFiles = setts.files.size(); int numFiles = setts.files.size();
for (auto& file : setts.files) { for (auto& file : setts.files) {
AudioFile<double> audioFile; AudioFile<double> audioFile;
@ -105,21 +133,19 @@ int main(int argc, char** argv)
output[chName].push_back({ output[chName].push_back({
{"begin", currentSample}, {"begin", currentSample},
{"end", currentSample + sampleInterval}, {"end", currentSample + sampleInterval}
{"spectrum", nlohmann::json::array()}
}); });
for (const std::pair<double, double>& pair : spectrum) { toJson(output[chName].back(), spectrum);
output[chName].back()["spectrum"].push_back({ {"freq", pair.first}, {"mag", pair.second } });
}
PRINTER(setts, "\rAnalyzing " << filename << "... Channel " << c << "/" << numChannels << " " << (int)std::floor((float)currentSample / (float)audioFile.samples[c-1].size() * 100.0f) << "% "); 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")); std::ofstream ofs(file.replace_extension("json"));
ofs << std::setw(4) << output << std::endl; ofs << std::setw(4) << output.dump() << std::endl;
ofs.close(); ofs.close();
PRINTER(setts, "\rAnalyzing " << filename << "... 100% " << std::endl); 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<unsigned int>()->default_value("0")) ("m,mono", "Analyze only the given channel", cxxopts::value<unsigned int>()->default_value("0"))
("approx", "Use faster, but more inaccurate trigonometric functions instead of the std-functions (EXPERIMENTAL)") ("approx", "Use faster, but more inaccurate trigonometric functions instead of the std-functions (EXPERIMENTAL)")
("files", "Files to fourier transform", cxxopts::value<std::vector<std::filesystem::path>>()) ("files", "Files to fourier transform", cxxopts::value<std::vector<std::filesystem::path>>())
("legacy", "Uses the legacy data structure (WHICH IS VERY BAD!)", cxxopts::value<bool>()->default_value("false"))
("h,help", "Print usage") ("h,help", "Print usage")
; ;
@ -182,6 +209,7 @@ Settings Parse(int argc, char** argv)
setts.analyzeChannel = (result.count("mono") ? result["mono"].as<unsigned int>() : 0); setts.analyzeChannel = (result.count("mono") ? result["mono"].as<unsigned int>() : 0);
setts.zeropadding = (result.count("pad") ? result["pad"].as<unsigned int>() : 1); setts.zeropadding = (result.count("pad") ? result["pad"].as<unsigned int>() : 1);
setts.approx = (result.count("approx") ? true : false); setts.approx = (result.count("approx") ? true : false);
setts.legacy = (result.count("legacy") ? result["legacy"].as<bool>() : false);
if (!result.count("window")) if (!result.count("window"))
{ {