sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add flags to the command line client for oversampling and preloading

Browse source
This commit is contained in:
Paul Ferrand 2019-12-01 21:40:27 +01:00
parent a6a1808403
commit 0d285cf494
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
clients/jack_client.cpp
View file

@ -23,6 +23,7 @@
#include "sfizz.hpp" #include "sfizz.hpp"
#include <absl/flags/parse.h> #include <absl/flags/parse.h>
#include <absl/flags/flag.h>
#include <absl/types/span.h> #include <absl/types/span.h>
#include <atomic> #include <atomic>
#include <cstddef> #include <cstddef>
@ -156,17 +157,36 @@ static void done(int sig [[maybe_unused]])
// exit(0); // exit(0);
} }
ABSL_FLAG(std::string, oversampling, "1x", "Internal oversampling factor (value values are 1x, 2x, 4x, 8x)");
ABSL_FLAG(uint32_t, preload_size, 8192, "Preloaded value");
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
// std::ios::sync_with_stdio(false); // std::ios::sync_with_stdio(false);
auto arguments = absl::ParseCommandLine(argc, argv); auto arguments = absl::ParseCommandLine(argc, argv);
auto filesToParse = absl::MakeConstSpan(arguments).subspan(1); auto filesToParse = absl::MakeConstSpan(arguments).subspan(1);
const std::string oversampling = absl::GetFlag(FLAGS_oversampling);
const uint32_t preload_size = absl::GetFlag(FLAGS_preload_size);
std::cout << "Flags" << '\n';
std::cout << "- Oversampling: " << oversampling << '\n';
std::cout << "- Preloaded Size: " << preload_size << '\n';
const auto factor = [&]() {
if (oversampling == "x1") return sfz::Oversampling::x1;
if (oversampling == "x2") return sfz::Oversampling::x2;
if (oversampling == "x4") return sfz::Oversampling::x4;
if (oversampling == "x8") return sfz::Oversampling::x8;
return sfz::Oversampling::x1;
}();
std::cout << "Positional arguments:"; std::cout << "Positional arguments:";
for (auto& file : filesToParse) for (auto& file : filesToParse)
std::cout << " " << file << ','; std::cout << " " << file << ',';
std::cout << '\n'; std::cout << '\n';
sfz::Synth synth; sfz::Synth synth;
synth.setOversamplingFactor(factor);
synth.setPreloadSize(preload_size);
synth.loadSfzFile(filesToParse[0]); synth.loadSfzFile(filesToParse[0]);
std::cout << "==========" << '\n'; std::cout << "==========" << '\n';
std::cout << "Total:" << '\n'; std::cout << "Total:" << '\n';

4
src/sfizz/FilePool.cpp
View file

@ -141,10 +141,10 @@ bool sfz::FilePool::preloadFile(const std::string& filename, uint32_t maxOffset)
if (preloadedFiles.contains(filename)) { if (preloadedFiles.contains(filename)) {
if (framesToLoad > preloadedFiles[filename].preloadedData->getNumFrames()) { if (framesToLoad > preloadedFiles[filename].preloadedData->getNumFrames()) {
preloadedFiles[filename].preloadedData = readFromFile<float>(sndFile, framesToLoad); preloadedFiles[filename].preloadedData = readFromFile<float>(sndFile, framesToLoad, oversamplingFactor);
} }
} else { } else {
preloadedFiles.insert_or_assign(filename, { readFromFile<float>(sndFile, framesToLoad), static_cast<float>(sndFile.samplerate()) * static_cast<float>(oversamplingFactor) }); preloadedFiles.insert_or_assign(filename, { readFromFile<float>(sndFile, framesToLoad, oversamplingFactor), static_cast<float>(sndFile.samplerate() * oversamplingFactor) });
} }
return true; return true;