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

Added FileData::Status::FullLoaded

Browse source
This commit is contained in:
KIRA Ryouta 2024-02-14 08:55:37 +09:00 • committed by Paul Ferrand
parent 85a275223a
commit 40e726c12a
2 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
src/sfizz/FilePool.cpp
View file

@ -332,11 +332,14 @@ bool sfz::FilePool::preloadFile(const FileId& fileId, uint32_t maxOffset) noexce
const auto existingFile = preloadedFiles.find(fileId); const auto existingFile = preloadedFiles.find(fileId);
if (existingFile != preloadedFiles.end()) { if (existingFile != preloadedFiles.end()) {
if (framesToLoad > existingFile->second.preloadedData.getNumFrames()) { auto& fileData = existingFile->second;
if (framesToLoad > fileData.preloadedData.getNumFrames()) {
preloadedFiles[fileId].information.maxOffset = maxOffset; preloadedFiles[fileId].information.maxOffset = maxOffset;
preloadedFiles[fileId].preloadedData = readFromFile(*reader, framesToLoad); preloadedFiles[fileId].preloadedData = readFromFile(*reader, framesToLoad);
if (fileData.status == FileData::Status::Preloaded)
fileData.status = frames == framesToLoad ? FileData::Status::FullLoaded : FileData::Status::Preloaded;
} }
existingFile->second.preloadCallCount++; fileData.preloadCallCount++;
} else { } else {
fileInformation->sampleRate = static_cast<double>(reader->sampleRate()); fileInformation->sampleRate = static_cast<double>(reader->sampleRate());
auto insertedPair = preloadedFiles.insert_or_assign(fileId, { auto insertedPair = preloadedFiles.insert_or_assign(fileId, {
@ -344,7 +347,7 @@ bool sfz::FilePool::preloadFile(const FileId& fileId, uint32_t maxOffset) noexce
*fileInformation *fileInformation
}); });
insertedPair.first->second.status = FileData::Status::Preloaded; insertedPair.first->second.status = frames == framesToLoad ? FileData::Status::FullLoaded : FileData::Status::Preloaded;
insertedPair.first->second.preloadCallCount++; insertedPair.first->second.preloadCallCount++;
} }
@ -399,7 +402,7 @@ sfz::FileDataHolder sfz::FilePool::loadFile(const FileId& fileId) noexcept
readFromFile(*reader, frames), readFromFile(*reader, frames),
*fileInformation *fileInformation
}); });
insertedPair.first->second.status = FileData::Status::Preloaded; insertedPair.first->second.status = FileData::Status::FullLoaded;
insertedPair.first->second.preloadCallCount++; insertedPair.first->second.preloadCallCount++;
return { &insertedPair.first->second }; return { &insertedPair.first->second };
} }
@ -417,7 +420,7 @@ sfz::FileDataHolder sfz::FilePool::loadFromRam(const FileId& fileId, const std::
readFromFile(*reader, frames), readFromFile(*reader, frames),
*fileInformation *fileInformation
}); });
insertedPair.first->second.status = FileData::Status::Preloaded; insertedPair.first->second.status = FileData::Status::FullLoaded;
insertedPair.first->second.preloadCallCount++; insertedPair.first->second.preloadCallCount++;
DBG("Added a file " << fileId.filename()); DBG("Added a file " << fileId.filename());
return { &insertedPair.first->second }; return { &insertedPair.first->second };
@ -435,8 +438,9 @@ sfz::FileDataHolder sfz::FilePool::getFilePromise(const std::shared_ptr<FileId>&
return {}; return {};
} }
if (!loadInRam) { auto& fileData = preloaded->second;
QueuedFileData queuedData { fileId, &preloaded->second }; if (fileData.status != FileData::Status::FullLoaded) {
QueuedFileData queuedData { fileId, &fileData };
if (!filesToLoad->try_push(queuedData)) { if (!filesToLoad->try_push(queuedData)) {
DBG("[sfizz] Could not enqueue the file to load for " << fileId << " (queue capacity " << filesToLoad->capacity() << ")"); DBG("[sfizz] Could not enqueue the file to load for " << fileId << " (queue capacity " << filesToLoad->capacity() << ")");
return {}; return {};
@ -458,10 +462,19 @@ void sfz::FilePool::setPreloadSize(uint32_t preloadSize) noexcept
// Update all the preloaded sizes // Update all the preloaded sizes
for (auto& preloadedFile : preloadedFiles) { for (auto& preloadedFile : preloadedFiles) {
const auto maxOffset = preloadedFile.second.information.maxOffset; auto& fileId = preloadedFile.first;
fs::path file { rootDirectory / preloadedFile.first.filename() }; auto& fileData = preloadedFile.second;
AudioReaderPtr reader = createAudioReader(file, preloadedFile.first.isReverse()); const uint32_t maxOffset = fileData.information.maxOffset;
preloadedFile.second.preloadedData = readFromFile(*reader, preloadSize + maxOffset); fs::path file { rootDirectory / fileId.filename() };
AudioReaderPtr reader = createAudioReader(file, fileId.isReverse());
const uint32_t frames = static_cast<uint32_t>(reader->frames());
const uint32_t framesToLoad = min(frames, maxOffset + preloadSize);
fileData.preloadedData = readFromFile(*reader, framesToLoad);
const FileData::Status status = fileData.status;
if (status == FileData::Status::FullLoaded || status == FileData::Status::Preloaded) {
fileData.status = frames == framesToLoad ? FileData::Status::FullLoaded : FileData::Status::Preloaded;
}
} }
} }
@ -619,10 +632,12 @@ void sfz::FilePool::setRamLoading(bool loadInRam) noexcept
for (auto& preloadedFile : preloadedFiles) { for (auto& preloadedFile : preloadedFiles) {
fs::path file { rootDirectory / preloadedFile.first.filename() }; fs::path file { rootDirectory / preloadedFile.first.filename() };
AudioReaderPtr reader = createAudioReader(file, preloadedFile.first.isReverse()); AudioReaderPtr reader = createAudioReader(file, preloadedFile.first.isReverse());
preloadedFile.second.preloadedData = readFromFile( auto& fileData = preloadedFile.second;
fileData.preloadedData = readFromFile(
*reader, *reader,
preloadedFile.second.information.end fileData.information.end
); );
fileData.status = FileData::Status::FullLoaded;
} }
} else { } else {
setPreloadSize(preloadSize); setPreloadSize(preloadSize);

2
src/sfizz/FilePool.h
View file

@ -67,7 +67,7 @@ struct FileInformation {
// Strict C++11 disallows member initialization if aggregate initialization is to be used... // Strict C++11 disallows member initialization if aggregate initialization is to be used...
struct FileData struct FileData
{ {
enum class Status { Invalid, Preloaded, Streaming, Done }; enum class Status { Invalid, Preloaded, Streaming, Done, FullLoaded };
FileData() = default; FileData() = default;
FileData(FileAudioBuffer preloaded, FileInformation info) FileData(FileAudioBuffer preloaded, FileInformation info)
: preloadedData(std::move(preloaded)), information(std::move(info)) : preloadedData(std::move(preloaded)), information(std::move(info))