Implemented time offset node

app/node/factory.cpp

@@ -53,6 +53,7 @@
 #include "project/folder/folder.h"
 #include "project/footage/footage.h"
 #include "project/sequence/sequence.h"
+#include "time/timeoffset/timeoffsetnode.h"
 #include "time/timeremap/timeremap.h"
 
 namespace olive {
@@ -261,6 +262,8 @@ Node *NodeFactory::CreateFromFactoryIndex(const NodeFactory::InternalID &id)
     return new FlipDistortNode();
   case kNoiseGenerator:
     return new NoiseGeneratorNode();
+  case kTimeOffsetNode:
+    return new TimeOffsetNode();
 
   case kInternalNodeCount:
     break;

app/node/factory.h

@@ -65,6 +65,7 @@ public:
     kOpacityEffect,
     kFlipDistort,
     kNoiseGenerator,
+    kTimeOffsetNode,
 
     // Count value
     kInternalNodeCount

app/node/time/CMakeLists.txt

@@ -14,6 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+add_subdirectory(timeoffset)
 add_subdirectory(timeremap)
 
 set(OLIVE_SOURCES

app/node/time/timeoffset/CMakeLists.txt

@@ -0,0 +1,22 @@
+# Olive - Non-Linear Video Editor
+# Copyright (C) 2021 Olive Team
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+set(OLIVE_SOURCES
+  ${OLIVE_SOURCES}
+  node/time/timeoffset/timeoffsetnode.cpp
+  node/time/timeoffset/timeoffsetnode.h
+  PARENT_SCOPE
+)

app/node/time/timeoffset/timeoffsetnode.cpp

@@ -0,0 +1,91 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2021 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#include "timeoffsetnode.h"
+
+#include "widget/slider/rationalslider.h"
+
+namespace olive {
+
+const QString TimeOffsetNode::kTimeInput = QStringLiteral("time_in");
+const QString TimeOffsetNode::kInputInput = QStringLiteral("input_in");
+
+#define super Node
+
+TimeOffsetNode::TimeOffsetNode()
+{
+  AddInput(kTimeInput, NodeValue::kRational, QVariant::fromValue(rational(0)), InputFlags(kInputFlagNotConnectable));
+  SetInputProperty(kTimeInput, QStringLiteral("view"), RationalSlider::kTime);
+  SetInputProperty(kTimeInput, QStringLiteral("viewlock"), true);
+  IgnoreHashingFrom(kTimeInput);
+
+  AddInput(kInputInput, NodeValue::kNone, InputFlags(kInputFlagNotKeyframable));
+}
+
+void TimeOffsetNode::Retranslate()
+{
+  SetInputName(kTimeInput, QStringLiteral("Time"));
+  SetInputName(kInputInput, QStringLiteral("Input"));
+}
+
+TimeRange TimeOffsetNode::InputTimeAdjustment(const QString &input, int element, const TimeRange &input_time) const
+{
+  if (input == kInputInput) {
+    return TimeRange(GetRemappedTime(input_time.in()), GetRemappedTime(input_time.out()));
+  } else {
+    return super::InputTimeAdjustment(input, element, input_time);
+  }
+}
+
+TimeRange TimeOffsetNode::OutputTimeAdjustment(const QString &input, int element, const TimeRange &input_time) const
+{
+  /*if (input == kInputInput) {
+    rational target_time = GetValueAtTime(kTimeInput, input_time.in()).value<rational>();
+
+    return TimeRange(target_time, target_time + input_time.length());
+  } else {
+    return super::OutputTimeAdjustment(input, element, input_time);
+  }*/
+  return super::OutputTimeAdjustment(input, element, input_time);
+}
+
+void TimeOffsetNode::Value(const NodeValueRow &value, const NodeGlobals &globals, NodeValueTable *table) const
+{
+  table->Push(value[kInputInput]);
+}
+
+void TimeOffsetNode::Hash(QCryptographicHash &hash, const NodeGlobals &globals, const VideoParams &video_params) const
+{
+  // Don't hash anything of our own, just pass-through to the connected node at the remapped tmie
+  if (IsInputConnected(kInputInput)) {
+    Node *out = GetConnectedOutput(kInputInput);
+
+    NodeGlobals new_globals = globals;
+    new_globals.set_time(TimeRange(GetRemappedTime(globals.time().in()), GetRemappedTime(globals.time().out())));
+    Node::Hash(out, GetValueHintForInput(kInputInput), hash, new_globals, video_params);
+  }
+}
+
+rational TimeOffsetNode::GetRemappedTime(const rational &input) const
+{
+  return input + GetValueAtTime(kTimeInput, input).value<rational>();
+}
+
+}

app/node/time/timeoffset/timeoffsetnode.h

@@ -0,0 +1,76 @@
+/***
+
+  Olive - Non-Linear Video Editor
+  Copyright (C) 2021 Olive Team
+
+  This program is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+***/
+
+#ifndef TIMEOFFSETNODE_H
+#define TIMEOFFSETNODE_H
+
+#include "node/node.h"
+
+namespace olive {
+
+class TimeOffsetNode : public Node
+{
+public:
+  TimeOffsetNode();
+
+  NODE_DEFAULT_DESTRUCTOR(TimeOffsetNode)
+  NODE_COPY_FUNCTION(TimeOffsetNode)
+
+  virtual QString Name() const override
+  {
+    return tr("Time Offset");
+  }
+
+  virtual QString id() const override
+  {
+    return QStringLiteral("org.olivevideoeditor.Olive.timeoffset");
+  }
+
+  virtual QVector<CategoryID> Category() const override
+  {
+    return {kCategoryGeneral};
+  }
+
+  virtual QString Description() const override
+  {
+    return tr("Offset time passing through the graph.");
+  }
+
+  virtual TimeRange InputTimeAdjustment(const QString& input, int element, const TimeRange& input_time) const override;
+  virtual TimeRange OutputTimeAdjustment(const QString& input, int element, const TimeRange& input_time) const override;
+
+  virtual void Retranslate() override;
+
+  virtual void Value(const NodeValueRow& value, const NodeGlobals &globals, NodeValueTable *table) const override;
+
+  static const QString kTimeInput;
+  static const QString kInputInput;
+
+protected:
+  virtual void Hash(QCryptographicHash &hash, const NodeGlobals &globals, const VideoParams& video_params) const override;
+
+private:
+  rational GetRemappedTime(const rational& input) const;
+
+};
+
+}
+
+#endif // TIMEOFFSETNODE_H