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

further reduced output file size

Browse source
This commit is contained in:
Lauchmelder 2021-12-19 22:39:13 +01:00
parent 9558264b5a
commit d3f71641f1
1 changed files with 27 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/main.cpp
View file

@ -56,14 +56,10 @@ int main(int argc, char** argv)
{ {
toJson = [](nlohmann::json& target, const std::vector<std::pair<double, double>>& spectrum) toJson = [](nlohmann::json& target, const std::vector<std::pair<double, double>>& spectrum)
{ {
target.push_back({ "spectrum", { target.push_back({ "spectrum", nlohmann::json::array() });
{ "freqs", nlohmann::json::array() },
{ "mags", nlohmann::json::array() }
} });
for (const std::pair<double, double>& pair : spectrum) { for (const std::pair<double, double>& pair : spectrum) {
target["spectrum"]["freqs"].push_back(pair.first); target["spectrum"].push_back(pair.second);
target["spectrum"]["mags"].push_back(pair.second);
} }
}; };
} }
@ -83,6 +79,9 @@ int main(int argc, char** argv)
int numChannels = audioFile.getNumChannels(); int numChannels = audioFile.getNumChannels();
nlohmann::json output; nlohmann::json output;
if(!setts.legacy)
output["freqs"] = nlohmann::json::array();
int c = setts.analyzeChannel; int c = setts.analyzeChannel;
if (c == 0) if (c == 0)
c = 1; c = 1;
@ -95,26 +94,7 @@ int main(int argc, char** argv)
std::string chName = "channel_" + std::to_string(c); std::string chName = "channel_" + std::to_string(c);
output[chName] = nlohmann::json::array(); 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, audioFile.samples[c-1].size());
std::vector<std::pair<double, double>> spectrum =
FFT(
audioFile.samples[c-1].cbegin(),
audioFile.samples[c-1].cend(),
sampleRate,
setts.minFreq, setts.maxFreq,
setts.zeropadding
);
output[chName] = nlohmann::json::array();
for (const std::pair<double, double>& pair : spectrum) {
output[chName].push_back({ {"freq", pair.first}, {"mag", pair.second } });
}
}
else
{
int sampleInterval = sampleRate * setts.splitInterval / 1000;
SetWindowFunction(setts.window, sampleInterval); SetWindowFunction(setts.window, sampleInterval);
int currentSample; int currentSample;
for (currentSample = 0; currentSample < audioFile.samples[c - 1].size(); currentSample += sampleInterval) for (currentSample = 0; currentSample < audioFile.samples[c - 1].size(); currentSample += sampleInterval)
@ -131,6 +111,13 @@ int main(int argc, char** argv)
setts.zeropadding setts.zeropadding
); );
if (!setts.legacy && output["freqs"].empty())
{
for (const std::pair<double, double>& pair : spectrum) {
output["freqs"].push_back(pair.first);
}
}
output[chName].push_back({ output[chName].push_back({
{"begin", currentSample}, {"begin", currentSample},
{"end", currentSample + sampleInterval} {"end", currentSample + sampleInterval}
@ -139,8 +126,6 @@ int main(int argc, char** argv)
toJson(output[chName].back(), spectrum); 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) << "% "); 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;
}
} }
} }