Merge branch 'master' into cache-update

app/render/rendermanager.cpp

@@ -35,6 +35,7 @@
 namespace olive {
 
 RenderManager* RenderManager::instance_ = nullptr;
+const rational RenderManager::kDryRunInterval = rational(10);
 
 RenderManager::RenderManager(QObject *parent) :
   backend_(kOpenGL),
@@ -52,9 +53,11 @@ RenderManager::RenderManager(QObject *parent) :
 
   if (context_) {
     video_thread_ = new RenderThread(context_, decoder_cache_, shader_cache_, this);
+    dry_run_thread_ = new RenderThread(nullptr, decoder_cache_, shader_cache_, this);
     audio_thread_ = new RenderThread(nullptr, decoder_cache_, shader_cache_, this);
 
     video_thread_->start(QThread::IdlePriority);
+    dry_run_thread_->start(QThread::IdlePriority);
     audio_thread_->start(QThread::IdlePriority);
   }
 
@@ -73,6 +76,9 @@ RenderManager::~RenderManager()
     video_thread_->quit();
     video_thread_->wait();
 
+    dry_run_thread_->quit();
+    dry_run_thread_->wait();
+
     context_->PostDestroy();
     delete context_;
 
@@ -92,6 +98,8 @@ RenderTicketPtr RenderManager::RenderFrame(const RenderVideoParams &params)
   ticket->setProperty("matrix", params.force_matrix);
   ticket->setProperty("format", params.force_format);
   ticket->setProperty("usecache", params.use_cache);
+  ticket->setProperty("channelcount", params.force_channel_count);
+  ticket->setProperty("mode", params.mode);
   ticket->setProperty("type", kTypeVideo);
   ticket->setProperty("colormanager", Node::PtrToValue(params.color_manager));
   ticket->setProperty("coloroutput", QVariant::fromValue(params.force_color_output));
@@ -103,7 +111,11 @@ RenderTicketPtr RenderManager::RenderFrame(const RenderVideoParams &params)
   ticket->setProperty("cachetimebase", QVariant::fromValue(params.cache_timebase));
   ticket->setProperty("cacheid", QVariant::fromValue(params.cache_id));
 
-  video_thread_->AddTicket(ticket);
+  if (params.return_type == ReturnType::kNull) {
+    dry_run_thread_->AddTicket(ticket);
+  } else {
+    video_thread_->AddTicket(ticket);
+  }
 
   return ticket;
 }
@@ -131,6 +143,8 @@ bool RenderManager::RemoveTicket(RenderTicketPtr ticket)
     return true;
   } else if (audio_thread_->RemoveTicket(ticket)) {
     return true;
+  } else if (dry_run_thread_->RemoveTicket(ticket)) {
+    return true;
   } else {
     return false;
   }