oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cache: mild auto-cache overhaul

Browse Source 
Shifted from CacheTask to functionality built into RenderBackend. It was
a lot easier to control behavior this way without having to juggle a ton
of threads and race conditions.

Could likely be multithreaded further.
This commit is contained in:
itsmattkc
2020-08-05 02:19:04 +10:00
parent 07a3216a1f
commit c8def73b95
14 changed files with 692 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/task/cache/cache.cpp
Vendored
+1 -1
View File
@@ -72,7 +72,7 @@ QFuture<void> CacheTask::DownloadFrame(FramePtr frame, const QByteArray &hash)
void CacheTask::FrameDownloaded(const QByteArray &hash, const std::list<rational> &times)
{
foreach (const rational& t, times) {
viewer()->video_frame_cache()->SetHash(t, hash, job_time());
viewer()->video_frame_cache()->SetHash(t, hash, job_time(), true);
}
}
app/task/render/render.cpp
+5 -3
View File
@@ -189,10 +189,12 @@ void RenderTask::Render(const TimeRangeList& video_range,
while (!IsCancelled() && i != render_lookup_table.end()) {
if (i->frame_future->IsFinished()) {
FramePtr f = i->frame_future->Get().value<FramePtr>();
if (!i->frame_future->WasCancelled()) {
FramePtr f = i->frame_future->Get().value<FramePtr>();
// Start multithreaded download here
download_futures.push_back({i->hash, DownloadFrame(f, i->hash)});
// Start multithreaded download here
download_futures.push_back({i->hash, DownloadFrame(f, i->hash)});
}
i = render_lookup_table.erase(i);
} else {