nodes: store time with accelerated jobs

Fixes #2031

app/node/audio/pan/pan.cpp

@@ -64,8 +64,6 @@ QString PanNode::Description() const
 
 void PanNode::Value(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
 {
-  Q_UNUSED(globals)
-
   // Create a sample job
   SampleBuffer samples = value[kSamplesInput].toSamples();
   if (samples.is_allocated()) {
@@ -85,7 +83,7 @@ void PanNode::Value(const NodeValueRow &value, const NodeGlobals &globals, NodeV
         table->Push(NodeValue(NodeValue::kSamples, samples, this));
       } else {
         // Requires job
-        table->Push(NodeValue::kSamples, SampleJob(kSamplesInput, value), this);
+        table->Push(NodeValue::kSamples, SampleJob(globals.time(), kSamplesInput, value), this);
       }
     } else {
       // Pass right through

app/node/audio/volume/volume.cpp

@@ -63,8 +63,6 @@ QString VolumeNode::Description() const
 
 void VolumeNode::Value(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
 {
-  Q_UNUSED(globals)
-
   // Create a sample job
   SampleBuffer buffer = value[kSamplesInput].toSamples();
 
@@ -80,7 +78,7 @@ void VolumeNode::Value(const NodeValueRow &value, const NodeGlobals &globals, No
       table->Push(NodeValue::kSamples, QVariant::fromValue(buffer), this);
     } else {
       // Requires job
-      SampleJob job(kSamplesInput, value);
+      SampleJob job(globals.time(), kSamplesInput, value);
       job.Insert(kVolumeInput, value);
       table->Push(NodeValue::kSamples, QVariant::fromValue(job), this);
     }

app/node/math/math/mathbase.cpp

@@ -410,7 +410,7 @@ void MathNodeBase::ValueInternal(Operation operation, Pairing pairing, const QSt
 
         output->Push(NodeValue::kSamples, QVariant::fromValue(buffer), this);
       } else {
-        SampleJob job(val_a.type() == NodeValue::kSamples ? val_a : val_b);
+        SampleJob job(globals.time(), val_a.type() == NodeValue::kSamples ? val_a : val_b);
         job.Insert(number_param, NodeValue(NodeValue::kFloat, number, this));
         output->Push(NodeValue::kSamples, QVariant::fromValue(job), this);
       }

app/node/project/footage/footage.cpp

@@ -265,7 +265,7 @@ void Footage::Value(const NodeValueRow &value, const NodeGlobals &globals, NodeV
     // Push each stream as a footage job
     for (int i=0; i<GetTotalStreamCount(); i++) {
       Track::Reference ref = GetReferenceFromRealIndex(i);
-      FootageJob job(decoder_, filename(), ref.type(), GetLength());
+      FootageJob job(globals.time(), decoder_, filename(), ref.type(), GetLength());
 
       NodeValue::Type type;
 

app/node/traverser.cpp

@@ -61,7 +61,7 @@ NodeValueRow NodeTraverser::GenerateRow(NodeValueDatabase *database, const Node
     row.insert(it.key(), value);
   }
 
-  PreProcessRow(range, row);
+  PreProcessRow(row);
 
   return row;
 }
@@ -357,7 +357,7 @@ QVector2D NodeTraverser::GenerateResolution() const
   return QVector2D(video_params_.square_pixel_width(), video_params_.height());
 }
 
-void NodeTraverser::ResolveJobs(NodeValue &val, const TimeRange &range)
+void NodeTraverser::ResolveJobs(NodeValue &val)
 {
   if (val.type() == NodeValue::kTexture || val.type() == NodeValue::kSamples) {
     if (val.canConvert<CacheJob>()) {
@@ -374,7 +374,7 @@ void NodeTraverser::ResolveJobs(NodeValue &val, const TimeRange &range)
 
       ShaderJob job = val.value<ShaderJob>();
 
-      PreProcessRow(range, job.GetValues());
+      PreProcessRow(job.GetValues());
 
       VideoParams tex_params = GetCacheVideoParams();
       tex_params.set_channel_count(GetChannelCountFromJob(job));
@@ -389,7 +389,7 @@ void NodeTraverser::ResolveJobs(NodeValue &val, const TimeRange &range)
 
       TexturePtr tex = CreateTexture(tex_params);
 
-      ProcessShader(tex, val.source(), range, job);
+      ProcessShader(tex, val.source(), job);
 
       val.set_value(tex);
 
@@ -407,7 +407,7 @@ void NodeTraverser::ResolveJobs(NodeValue &val, const TimeRange &range)
 
       TexturePtr tex = CreateTexture(upload_params);
 
-      PreProcessRow(range, job.GetValues());
+      PreProcessRow(job.GetValues());
       ProcessFrameGeneration(tex, val.source(), job);
 
       if (!job.GetColorspace().isEmpty()) {
@@ -440,7 +440,7 @@ void NodeTraverser::ResolveJobs(NodeValue &val, const TimeRange &range)
 
       if (job.type() == Track::kVideo) {
 
-        rational footage_time = Footage::AdjustTimeByLoopMode(range.in(), loop_mode_, job.length(), job.video_params().video_type(), job.video_params().frame_rate_as_time_base());
+        rational footage_time = Footage::AdjustTimeByLoopMode(job.time().in(), loop_mode_, job.length(), job.video_params().video_type(), job.video_params().frame_rate_as_time_base());
 
         TexturePtr tex;
 
@@ -473,8 +473,8 @@ void NodeTraverser::ResolveJobs(NodeValue &val, const TimeRange &range)
 
       } else if (job.type() == Track::kAudio) {
 
-        SampleBuffer buffer = CreateSampleBuffer(GetCacheAudioParams(), range.length());
-        ProcessAudioFootage(buffer, job, range);
+        SampleBuffer buffer = CreateSampleBuffer(GetCacheAudioParams(), job.time().length());
+        ProcessAudioFootage(buffer, job, job.time());
         val.set_value(buffer);
 
       }
@@ -483,7 +483,7 @@ void NodeTraverser::ResolveJobs(NodeValue &val, const TimeRange &range)
 
       SampleJob job = val.value<SampleJob>();
       SampleBuffer output_buffer = CreateSampleBuffer(job.samples().audio_params(), job.samples().sample_count());
-      ProcessSamples(output_buffer, val.source(), range, job);
+      ProcessSamples(output_buffer, val.source(), job.time(), job);
       val.set_value(QVariant::fromValue(output_buffer));
 
     }
@@ -491,7 +491,7 @@ void NodeTraverser::ResolveJobs(NodeValue &val, const TimeRange &range)
   }
 }
 
-void NodeTraverser::PreProcessRow(const TimeRange &range, NodeValueRow &row)
+void NodeTraverser::PreProcessRow(NodeValueRow &row)
 {
   QByteArray cached_node_hash;
 
@@ -500,7 +500,7 @@ void NodeTraverser::PreProcessRow(const TimeRange &range, NodeValueRow &row)
     // Jobs will almost always be submitted with one of these types
     NodeValue &val = it.value();
 
-    ResolveJobs(val, range);
+    ResolveJobs(val);
   }
 }
 

app/node/traverser.h

@@ -93,7 +93,7 @@ protected:
 
   virtual void ProcessAudioFootage(SampleBuffer &destination, const FootageJob &stream, const TimeRange &input_time){}
 
-  virtual void ProcessShader(TexturePtr destination, const Node *node, const TimeRange &range, const ShaderJob& job){}
+  virtual void ProcessShader(TexturePtr destination, const Node *node, const ShaderJob& job){}
 
   virtual void ProcessColorTransform(TexturePtr destination, const Node *node, const ColorTransformJob& job){}
 
@@ -140,7 +140,7 @@ protected:
   CancelAtom *GetCancelPointer() const { return cancel_; }
   void SetCancelPointer(CancelAtom *cancel) { cancel_ = cancel; }
 
-  void ResolveJobs(NodeValue &value, const TimeRange &range);
+  void ResolveJobs(NodeValue &value);
 
   Block *GetCurrentBlock() const
   {
@@ -150,7 +150,7 @@ protected:
   Decoder::LoopMode loop_mode() const { return loop_mode_; }
 
 private:
-  void PreProcessRow(const TimeRange &range, NodeValueRow &row);
+  void PreProcessRow(NodeValueRow &row);
 
   TexturePtr CreateDummyTexture(const VideoParams &p);
 

app/render/job/footagejob.h

@@ -33,7 +33,8 @@ public:
   {
   }
 
-  FootageJob(const QString& decoder, const QString& filename, Track::Type type, const rational& length) :
+  FootageJob(const TimeRange &time, const QString& decoder, const QString& filename, Track::Type type, const rational& length) :
+    time_(time),
     decoder_(decoder),
     filename_(filename),
     type_(type),
@@ -96,7 +97,11 @@ public:
     length_ = length;
   }
 
+  const TimeRange &time() const { return time_; }
+
 private:
+  TimeRange time_;
+
   QString decoder_;
 
   QString filename_;

app/render/job/samplejob.h

@@ -23,6 +23,7 @@
 
 #include "acceleratedjob.h"
 #include "codec/samplebuffer.h"
+#include "common/timerange.h"
 
 namespace olive {
 
@@ -32,14 +33,16 @@ public:
   {
   }
 
-  SampleJob(const NodeValue& value)
+  SampleJob(const TimeRange &time, const NodeValue& value)
   {
     samples_ = value.toSamples();
+    time_ = time;
   }
 
-  SampleJob(const QString& from, const NodeValueRow& row)
+  SampleJob(const TimeRange &time, const QString& from, const NodeValueRow& row)
   {
     samples_ = row[from].toSamples();
+    time_ = time;
   }
 
   const SampleBuffer &samples() const
@@ -52,9 +55,13 @@ public:
     return samples_.is_allocated();
   }
 
+  const TimeRange &time() const { return time_; }
+
 private:
   SampleBuffer samples_;
 
+  TimeRange time_;
+
 };
 
 }

app/render/renderprocessor.cpp

@@ -54,7 +54,7 @@ TexturePtr RenderProcessor::GenerateTexture(const rational &time, const rational
 
   NodeValue tex_val = table.Get(NodeValue::kTexture);
 
-  ResolveJobs(tex_val, range);
+  ResolveJobs(tex_val);
 
   return tex_val.toTexture();
 }
@@ -226,7 +226,7 @@ void RenderProcessor::Run()
 
     NodeValue sample_val = table.Get(NodeValue::kSamples);
 
-    ResolveJobs(sample_val, time);
+    ResolveJobs(sample_val);
 
     SampleBuffer samples = sample_val.toSamples();
     if (samples.is_allocated()) {
@@ -522,7 +522,7 @@ void RenderProcessor::ProcessAudioFootage(SampleBuffer &destination, const Foota
   }
 }
 
-void RenderProcessor::ProcessShader(TexturePtr destination, const Node *node, const TimeRange &range, const ShaderJob &job)
+void RenderProcessor::ProcessShader(TexturePtr destination, const Node *node, const ShaderJob &job)
 {
   if (!render_ctx_) {
     return;

app/render/renderprocessor.h

@@ -48,7 +48,7 @@ protected:
 
   virtual void ProcessAudioFootage(SampleBuffer &destination, const FootageJob &stream, const TimeRange &input_time) override;
 
-  virtual void ProcessShader(TexturePtr destination, const Node *node, const TimeRange &range, const ShaderJob& job) override;
+  virtual void ProcessShader(TexturePtr destination, const Node *node, const ShaderJob& job) override;
 
   virtual void ProcessSamples(SampleBuffer &destination, const Node *node, const TimeRange &range, const SampleJob &job) override;