revise operation cache blocking system

Fixes #1553

app/node/output/track/track.cpp

@@ -417,6 +417,10 @@ QVector<Block *> Track::BlocksAtTimeRange(const TimeRange &range) const
 
 void Track::InvalidateCache(const TimeRange& range, const QString& from, int element, qint64 job_time)
 {
+  if (GetOperationStack() != 0) {
+    return;
+  }
+
   TimeRange limited;
 
   const Block* b;
@@ -431,8 +435,8 @@ void Track::InvalidateCache(const TimeRange& range, const QString& from, int ele
 
     limited = TimeRange(qMax(range.in(), b->in()), qMin(range.out(), b->out()));
   } else {
-    limited = TimeRange(qMax(range.in(), rational(0)), qMin(range.out(), qMax(last_invalidated_length_, track_length())));
-    last_invalidated_length_ = track_length();
+    limited = TimeRange(qMax(range.in(), rational(0)), qMin(range.out(), qMax(preop_track_length_, track_length())));
+    preop_track_length_ = track_length_;
   }
 
   Node::InvalidateCache(limited, from, element, job_time);
@@ -578,6 +582,15 @@ void Track::Hash(const QString &output, QCryptographicHash &hash, const rational
   }
 }
 
+void Track::EndOperation()
+{
+  super::EndOperation();
+
+  if (track_length_ != midop_track_length_) {
+    SetLengthInternal(midop_track_length_);
+  }
+}
+
 void Track::SetMuted(bool e)
 {
   SetStandardValue(kMutedInput, e);
@@ -629,13 +642,13 @@ int Track::GetCacheIndexFromArrayIndex(int index) const
 
 void Track::SetLengthInternal(const rational &r, bool invalidate)
 {
-  if (r != track_length_) {
-    // TimeRange will automatically normalize so that the shorter number is the in and the longer
-    // is the out
-    TimeRange invalidate_range(track_length_, r);
+  // Hold track length until operation stack is empty
+  midop_track_length_ = r;
 
+  if (GetOperationStack() == 0 && track_length_ != r) {
+    TimeRange invalidate_range(track_length_, r);
     track_length_ = r;
-    last_invalidated_length_ = qMax(last_invalidated_length_, track_length_);
+    preop_track_length_ = qMax(preop_track_length_, track_length_);
     emit TrackLengthChanged();
 
     if (invalidate) {

app/node/output/track/track.h

@@ -343,6 +343,8 @@ public:
     return waveform_;
   }
 
+  virtual void EndOperation() override;
+
   static const double kTrackHeightDefault;
   static const double kTrackHeightMinimum;
   static const double kTrackHeightInterval;
@@ -425,7 +427,9 @@ private:
 
   rational track_length_;
 
-  rational last_invalidated_length_;
+  rational midop_track_length_;
+
+  rational preop_track_length_;
 
   double track_height_;
 

app/node/output/viewer/viewer.cpp

@@ -38,8 +38,7 @@ const uint64_t ViewerOutput::kVideoParamEditMask = VideoParamEdit::kWidthHeight
 
 ViewerOutput::ViewerOutput(bool create_default_streams) :
   video_frame_cache_(this),
-  audio_playback_cache_(this),
-  operation_stack_(0)
+  audio_playback_cache_(this)
 {
   AddInput(kVideoParamsInput, NodeValue::kVideoParams, InputFlags(kInputFlagNotConnectable | kInputFlagNotKeyframable | kInputFlagArray));
   SetInputProperty(kVideoParamsInput, QStringLiteral("mask"), QVariant::fromValue(kVideoParamEditMask));
@@ -218,24 +217,22 @@ void ViewerOutput::InvalidateCache(const TimeRange& range, const QString& from,
 {
   Q_UNUSED(element)
 
-  if (operation_stack_ == 0) {
-    if (from == kTextureInput || from == kSamplesInput
-        || from == kVideoParamsInput || from == kAudioParamsInput) {
-      TimeRange invalidated_range(qMax(rational(), range.in()),
-                                  qMin(GetLength(), range.out()));
+  if (from == kTextureInput || from == kSamplesInput
+      || from == kVideoParamsInput || from == kAudioParamsInput) {
+    TimeRange invalidated_range(qMax(rational(), range.in()),
+                                qMin(GetLength(), range.out()));
 
-      if (invalidated_range.in() != invalidated_range.out()) {
-        if (from == kTextureInput || from == kVideoParamsInput) {
-          video_frame_cache_.Invalidate(invalidated_range, job_time);
-        } else {
-          audio_playback_cache_.Invalidate(invalidated_range, job_time);
-        }
+    if (invalidated_range.in() != invalidated_range.out()) {
+      if (from == kTextureInput || from == kVideoParamsInput) {
+        video_frame_cache_.Invalidate(invalidated_range, job_time);
+      } else {
+        audio_playback_cache_.Invalidate(invalidated_range, job_time);
       }
     }
-
-    VerifyLength();
   }
 
+  VerifyLength();
+
   super::InvalidateCache(range, from, element, job_time);
 }
 
@@ -298,10 +295,6 @@ void ViewerOutput::Retranslate()
 
 void ViewerOutput::VerifyLength()
 {
-  if (operation_stack_ != 0) {
-    return;
-  }
-
   NodeTraverser traverser;
 
   rational video_length, audio_length, subtitle_length;
@@ -364,20 +357,6 @@ rational ViewerOutput::GetCustomLength(Track::Type type) const
   return rational();
 }
 
-void ViewerOutput::BeginOperation()
-{
-  operation_stack_++;
-
-  super::BeginOperation();
-}
-
-void ViewerOutput::EndOperation()
-{
-  operation_stack_--;
-
-  super::EndOperation();
-}
-
 NodeOutput ViewerOutput::GetConnectedTextureOutput()
 {
   return GetConnectedOutput(kTextureInput);

app/node/output/viewer/viewer.h

@@ -136,10 +136,6 @@ public:
 
   virtual void Retranslate() override;
 
-  virtual void BeginOperation() override;
-
-  virtual void EndOperation() override;
-
   virtual NodeOutput GetConnectedTextureOutput();
 
   virtual NodeOutput GetConnectedSampleOutput();