From 85a7cae3ee35d71d9b131d6003b737bcf4380417 Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Mon, 25 May 2020 03:04:03 +1000
Subject: [PATCH] cache: improved cache behavior when updating values or render
 parameters

---
 app/render/playbackcache.h   |  4 ++--
 app/widget/viewer/viewer.cpp | 25 ++++++++++++++-----------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/app/render/playbackcache.h b/app/render/playbackcache.h
index be3f87b5e..2961fe103 100644
--- a/app/render/playbackcache.h
+++ b/app/render/playbackcache.h
@@ -35,6 +35,8 @@ public:
 
   void Invalidate(const TimeRange& r);
 
+  void InvalidateAll();
+
   const rational& GetLength() const
   {
     return length_;
@@ -64,8 +66,6 @@ signals:
 protected:
   void Validate(const TimeRange& r);
 
-  void InvalidateAll();
-
   virtual void LengthChangedEvent(const rational& old, const rational& newlen);
 
   virtual void InvalidateEvent(const TimeRange& range);
diff --git a/app/widget/viewer/viewer.cpp b/app/widget/viewer/viewer.cpp
index 4e54b49d1..4a8b900f0 100644
--- a/app/widget/viewer/viewer.cpp
+++ b/app/widget/viewer/viewer.cpp
@@ -113,9 +113,11 @@ ViewerWidget::ViewerWidget(QWidget *parent) :
   renderer_ = new OpenGLBackend(this);
 
   // Setup cache wait timer (waits a few seconds of inactivity before caching)
-  cache_wait_timer_.setInterval(1000);
+  cache_wait_timer_.setInterval(100);
   cache_wait_timer_.setSingleShot(true);
   connect(&cache_wait_timer_, &QTimer::timeout, this, &ViewerWidget::StartBackgroundCaching);
+
+  // Remove pointer to cache task if it's removed from the task manager
   connect(TaskManager::instance(), &TaskManager::TaskRemoved, this, &ViewerWidget::BackgroundCacheFinished);
 
   // Ensures that seeking on the waveform view updates the time as expected
@@ -241,8 +243,10 @@ void ViewerWidget::DisconnectNodeInternal(ViewerOutput *n)
   waveform_view_->SetViewer(nullptr);
   waveform_view_->ConnectTimelinePoints(nullptr);
 
-  StopAllBackgroundCacheTasks(true);
-  cache_background_task_ = nullptr;
+  if (cache_background_task_ == our_cache_background_task_) {
+    StopAllBackgroundCacheTasks(true);
+    cache_background_task_ = nullptr;
+  }
   cache_wait_timer_.stop();
 }
 
@@ -823,11 +827,12 @@ void ViewerWidget::HashGenerated()
   QFutureWatcher<QByteArray>* watcher = static_cast<QFutureWatcher<QByteArray>*>(sender());
 
   if (hash_watchers_.contains(watcher)) {
-    QString cache_fn = GetConnectedNode()->video_frame_cache()->CachePathName(watcher->result(), GetCurrentPixelFormat());
+    FrameHashCache* cache = GetConnectedNode()->video_frame_cache();
+
+    QString cache_fn = cache->CachePathName(watcher->result(), GetCurrentPixelFormat());
 
     if (QFileInfo::exists(cache_fn)) {
-      GetConnectedNode()->video_frame_cache()->SetHash(hash_watchers_.value(watcher),
-                                                       watcher->result());
+      cache->SetHash(hash_watchers_.value(watcher), watcher->result());
     }
 
     hash_watchers_.remove(watcher);
@@ -877,6 +882,8 @@ void ViewerWidget::UpdateRendererParameters()
     StopAllBackgroundCacheTasks(false);
   }
 
+  GetConnectedNode()->video_frame_cache()->InvalidateAll();
+
   StartBackgroundCaching();
 
   renderer_->SetVideoParams(GenerateVideoParams());
@@ -1201,14 +1208,10 @@ void ViewerWidget::ViewerInvalidatedRange(const TimeRange &range)
   cache_wait_timer_.stop();
   StopAllBackgroundCacheTasks(false);
 
-  if (qApp->mouseButtons() & Qt::LeftButton) {
+  if (!(qApp->mouseButtons() & Qt::LeftButton)) {
     cache_wait_timer_.start();
-  } else {
-    StartBackgroundCaching();
   }
 
-
-
   /*
   QList<rational> invalidated_frames = GetConnectedNode()->video_frame_cache()->GetFrameListFromTimeRange({range});
   foreach (const rational& r, invalidated_frames) {