Refactoring

OpenTimelineIO · Aug 17, 2024 · 6e4b25e · 6e4b25e
1 parent e188f05
commit 6e4b25e
Show file tree

Hide file tree

Showing 65 changed files with 939 additions and 247 deletions.
diff --git a/bin/main.cpp b/bin/main.cpp
@@ -13,12 +13,6 @@ using namespace toucan;
 
 int main(int argc, char** argv)
 {
-    std::filesystem::path parentPath = std::filesystem::path(argv[0]).parent_path();
-    auto host = std::make_shared<Host>(std::vector<std::filesystem::path>{
-        parentPath,
-        parentPath / ".." / ".."});
-    return 0;
-
     // Command line arguments.
     if (argc < 3)
     {
@@ -33,6 +27,7 @@ int main(int argc, char** argv)
         std::cout << std::endl;
         return 1;
     }
+    const std::filesystem::path parentPath = std::filesystem::path(argv[0]).parent_path();
     const std::filesystem::path inputPath(argv[1]);
     const std::filesystem::path outputPath(argv[2]);
     const auto outputSplit = splitFileNameNumber(outputPath.stem().string());
@@ -69,6 +64,11 @@ int main(int argc, char** argv)
     const auto traverse = std::make_shared<TimelineTraverse>(inputPath.parent_path(), timeline);
     const IMATH_NAMESPACE::V2d& imageSize = traverse->getImageSize();
 
+    // Create the host.
+    auto host = std::make_shared<Host>(std::vector<std::filesystem::path>{
+        parentPath,
+        parentPath / ".." / ".."});
+
     // Initialize the filmstrip.
     OIIO::ImageBuf filmstripBuf;
     const int thumbnailWidth = 120;
@@ -97,7 +97,7 @@ int main(int argc, char** argv)
         if (auto op = traverse->exec(time))
         {
             // Execute the image operation graph.
-            const auto buf = op->exec(time);
+            const auto buf = op->exec(time, host);
 
             // Save the image.
             if (!filmstrip)

diff --git a/lib/toucan/BoxOp.cpp b/lib/toucan/BoxOp.cpp
@@ -30,7 +30,9 @@ namespace toucan
         _data = value;
     }
 
-    OIIO::ImageBuf BoxOp::exec(const OTIO_NS::RationalTime& time)
+    OIIO::ImageBuf BoxOp::exec(
+        const OTIO_NS::RationalTime& time,
+        const std::shared_ptr<Host>& host)
     {
         OIIO::ImageBuf buf;
         if (!_inputs.empty() && _inputs[0])
@@ -40,7 +42,7 @@ namespace toucan
             {
                 offsetTime -= _timeOffset;
             }
-            buf = _inputs[0]->exec(offsetTime);
+            buf = _inputs[0]->exec(offsetTime, host);
             OIIO::ImageBufAlgo::render_box(
                 buf,
                 _data.pos1.x,

diff --git a/lib/toucan/BoxOp.h b/lib/toucan/BoxOp.h
@@ -30,7 +30,9 @@ namespace toucan
         const BoxData& getData() const;
         void setData(const BoxData&);
 
-        OIIO::ImageBuf exec(const OTIO_NS::RationalTime&) override;
+        OIIO::ImageBuf exec(
+            const OTIO_NS::RationalTime&,
+            const std::shared_ptr<Host>&) override;
 
     private:
         BoxData _data;

diff --git a/lib/toucan/CMakeLists.txt b/lib/toucan/CMakeLists.txt
@@ -54,7 +54,9 @@ set(SOURCE
     TransitionOp.cpp
     Util.cpp)
 if(WIN32)
-    list(APPEND SOURCE UtilWin32.cpp)
+    list(APPEND SOURCE
+        PluginWin32.cpp
+        UtilWin32.cpp)
 endif()
 
 add_library(toucan ${HEADERS} ${HEADERS_PRIVATE} ${SOURCE})

diff --git a/lib/toucan/CheckersOp.cpp b/lib/toucan/CheckersOp.cpp
@@ -30,7 +30,9 @@ namespace toucan
         _data = value;
     }
 
-    OIIO::ImageBuf CheckersOp::exec(const OTIO_NS::RationalTime& time)
+    OIIO::ImageBuf CheckersOp::exec(
+        const OTIO_NS::RationalTime& time,
+        const std::shared_ptr<Host>& host)
     {
         OIIO::ImageBuf buf;
         if (!_inputs.empty() && _inputs[0])
@@ -40,7 +42,7 @@ namespace toucan
             {
                 offsetTime -= _timeOffset;
             }
-            buf = _inputs[0]->exec(offsetTime);
+            buf = _inputs[0]->exec(offsetTime, host);
             OIIO::ImageBufAlgo::checker(
                 buf,
                 _data.checkerSize.x,

diff --git a/lib/toucan/CheckersOp.h b/lib/toucan/CheckersOp.h
@@ -30,7 +30,9 @@ namespace toucan
         const CheckersData& getData() const;
         void setData(const CheckersData&);
 
-        OIIO::ImageBuf exec(const OTIO_NS::RationalTime&) override;
+        OIIO::ImageBuf exec(
+            const OTIO_NS::RationalTime&,
+            const std::shared_ptr<Host>&) override;
 
     private:
         CheckersData _data;

diff --git a/lib/toucan/ColorMapOp.cpp b/lib/toucan/ColorMapOp.cpp
@@ -28,7 +28,9 @@ namespace toucan
         _data = value;
     }
 
-    OIIO::ImageBuf ColorMapOp::exec(const OTIO_NS::RationalTime& time)
+    OIIO::ImageBuf ColorMapOp::exec(
+        const OTIO_NS::RationalTime& time,
+        const std::shared_ptr<Host>& host)
     {
         OIIO::ImageBuf buf;
         if (!_inputs.empty() && _inputs[0])
@@ -39,7 +41,7 @@ namespace toucan
                 offsetTime -= _timeOffset;
             }
             buf = OIIO::ImageBufAlgo::color_map(
-                _inputs[0]->exec(offsetTime),
+                _inputs[0]->exec(offsetTime, host),
                 -1,
                 _data.mapName);
 

diff --git a/lib/toucan/ColorMapOp.h b/lib/toucan/ColorMapOp.h
@@ -27,7 +27,9 @@ namespace toucan
         const ColorMapData& getData() const;
         void setData(const ColorMapData&);
 
-        OIIO::ImageBuf exec(const OTIO_NS::RationalTime&) override;
+        OIIO::ImageBuf exec(
+            const OTIO_NS::RationalTime&,
+            const std::shared_ptr<Host>&) override;
 
     private:
         ColorMapData _data;

diff --git a/lib/toucan/CompOp.cpp b/lib/toucan/CompOp.cpp
@@ -20,7 +20,9 @@ namespace toucan
         _premult = premult;
     }
 
-    OIIO::ImageBuf CompOp::exec(const OTIO_NS::RationalTime& time)
+    OIIO::ImageBuf CompOp::exec(
+        const OTIO_NS::RationalTime& time,
+        const std::shared_ptr<Host>& host)
     {
         OIIO::ImageBuf buf;
         OTIO_NS::RationalTime offsetTime = time;
@@ -30,8 +32,8 @@ namespace toucan
         }
         if (_inputs.size() > 1 && _inputs[0] && _inputs[1])
         {
-            auto fg = _inputs[0]->exec(offsetTime);
-            auto bg = _inputs[1]->exec(offsetTime);
+            auto fg = _inputs[0]->exec(offsetTime, host);
+            auto bg = _inputs[1]->exec(offsetTime, host);
             if (_premult)
             {
                 fg = OIIO::ImageBufAlgo::premult(fg);
@@ -40,7 +42,7 @@ namespace toucan
         }
         else if (1 == _inputs.size() && _inputs[0])
         {
-            auto fg = _inputs[0]->exec(offsetTime);
+            auto fg = _inputs[0]->exec(offsetTime, host);
             if (_premult)
             {
                 fg = OIIO::ImageBufAlgo::premult(fg);

diff --git a/lib/toucan/CompOp.h b/lib/toucan/CompOp.h
@@ -19,7 +19,9 @@ namespace toucan
         //! Set whether images are pre-multiplied before compositing.
         void setPremult(bool);
 
-        OIIO::ImageBuf exec(const OTIO_NS::RationalTime&) override;
+        OIIO::ImageBuf exec(
+            const OTIO_NS::RationalTime&,
+            const std::shared_ptr<Host>&) override;
 
     private:
         bool _premult = false;

diff --git a/lib/toucan/FillOp.cpp b/lib/toucan/FillOp.cpp
@@ -30,7 +30,9 @@ namespace toucan
         _data = value;
     }
 
-    OIIO::ImageBuf FillOp::exec(const OTIO_NS::RationalTime& time)
+    OIIO::ImageBuf FillOp::exec(
+        const OTIO_NS::RationalTime& time,
+        const std::shared_ptr<Host>& host)
     {
         OIIO::ImageBuf buf;
         if (!_inputs.empty() && _inputs[0])
@@ -40,7 +42,7 @@ namespace toucan
             {
                 offsetTime -= _timeOffset;
             }
-            buf = _inputs[0]->exec(offsetTime);
+            buf = _inputs[0]->exec(offsetTime, host);
             OIIO::ImageBufAlgo::fill(
                 buf,
                 { _data.color.x, _data.color.y, _data.color.z, _data.color.w });

diff --git a/lib/toucan/FillOp.h b/lib/toucan/FillOp.h
@@ -28,7 +28,9 @@ namespace toucan
         const FillData& getData() const;
         void setData(const FillData&);
 
-        OIIO::ImageBuf exec(const OTIO_NS::RationalTime&) override;
+        OIIO::ImageBuf exec(
+            const OTIO_NS::RationalTime&,
+            const std::shared_ptr<Host>&) override;
 
     private:
         FillData _data;

diff --git a/lib/toucan/FlipOp.cpp b/lib/toucan/FlipOp.cpp
@@ -16,7 +16,9 @@ namespace toucan
     FlipOp::~FlipOp()
     {}
 
-    OIIO::ImageBuf FlipOp::exec(const OTIO_NS::RationalTime& time)
+    OIIO::ImageBuf FlipOp::exec(
+        const OTIO_NS::RationalTime& time,
+        const std::shared_ptr<Host>& host)
     {
         OIIO::ImageBuf buf;
         if (!_inputs.empty() && _inputs[0])
@@ -26,7 +28,7 @@ namespace toucan
             {
                 offsetTime -= _timeOffset;
             }
-            const auto input = _inputs[0]->exec(offsetTime);
+            const auto input = _inputs[0]->exec(offsetTime, host);
             buf = OIIO::ImageBufAlgo::flip(input);
         }
         return buf;

diff --git a/lib/toucan/FlipOp.h b/lib/toucan/FlipOp.h
@@ -16,7 +16,9 @@ namespace toucan
 
         virtual ~FlipOp();
 
-        OIIO::ImageBuf exec(const OTIO_NS::RationalTime&) override;
+        OIIO::ImageBuf exec(
+            const OTIO_NS::RationalTime&,
+            const std::shared_ptr<Host>&) override;
     };
 
     //! Flip OTIO effect.

diff --git a/lib/toucan/FlopOp.cpp b/lib/toucan/FlopOp.cpp
@@ -16,7 +16,9 @@ namespace toucan
     FlopOp::~FlopOp()
     {}
 
-    OIIO::ImageBuf FlopOp::exec(const OTIO_NS::RationalTime& time)
+    OIIO::ImageBuf FlopOp::exec(
+        const OTIO_NS::RationalTime& time,
+        const std::shared_ptr<Host>& host)
     {
         OIIO::ImageBuf buf;
         if (!_inputs.empty() && _inputs[0])
@@ -26,7 +28,7 @@ namespace toucan
             {
                 offsetTime -= _timeOffset;
             }
-            const auto input = _inputs[0]->exec(offsetTime);
+            const auto input = _inputs[0]->exec(offsetTime, host);
             buf = OIIO::ImageBufAlgo::flop(input);
         }
         return buf;

diff --git a/lib/toucan/FlopOp.h b/lib/toucan/FlopOp.h
@@ -16,7 +16,9 @@ namespace toucan
 
         virtual ~FlopOp();
 
-        OIIO::ImageBuf exec(const OTIO_NS::RationalTime&) override;
+        OIIO::ImageBuf exec(
+            const OTIO_NS::RationalTime&,
+            const std::shared_ptr<Host>&) override;
     };
 
     //! Flop OTIO effect.