Refactoring

OpenTimelineIO · Aug 18, 2024 · 14bca6a · 14bca6a
1 parent d172985
commit 14bca6a
Show file tree

Hide file tree

Showing 28 changed files with 670 additions and 375 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -27,7 +27,11 @@ if(APPLE)
 endif()
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
-set(TOUCAN_PLUGINS toucan-draw toucan-filter toucan-transform)
+set(TOUCAN_PLUGINS
+    toucan-draw
+    toucan-filter
+    toucan-generator
+    toucan-transform)
 
 enable_testing()
 

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
@@ -7,7 +7,7 @@ install(
     TARGETS toucan-render
     RUNTIME DESTINATION bin)
 
-foreach(OTIO CompositeTracks Filters Gap LinearTimeWarp Patterns Render Transition Transition2 Transforms)
+foreach(OTIO CompositeTracks Draw Filter Gap LinearTimeWarp Pattern Transition Transition2 Transform)
     add_test(
         toucan-render-${OTIO}
         ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/toucan-render${CMAKE_EXECUTABLE_SUFFIX}

diff --git a/bin/main.cpp b/bin/main.cpp
@@ -62,7 +62,7 @@ int main(int argc, char** argv)
 
     // Create the timeline graph.
     const auto graph = std::make_shared<TimelineGraph>(inputPath.parent_path(), timeline);
-    const IMATH_NAMESPACE::V2d& imageSize = graph->getImageSize();
+    const IMATH_NAMESPACE::V2d imageSize = graph->getImageSize();
 
     // Create the image effect host.
     auto host = std::make_shared<ImageEffectHost>(std::vector<std::filesystem::path>{

diff --git a/data/Render.otio → data/Draw.otio b/data/Render.otio → data/Draw.otio
@@ -1,7 +1,7 @@
 {
     "OTIO_SCHEMA": "Timeline.1", 
     "metadata": {},
-    "name": "Text",
+    "name": "Draw",
     "tracks": {
         "OTIO_SCHEMA": "Stack.1", 
         "children": [

diff --git a/data/Filters.otio → data/Filter.otio b/data/Filters.otio → data/Filter.otio
@@ -1,7 +1,7 @@
 {
     "OTIO_SCHEMA": "Timeline.1", 
     "metadata": {},
-    "name": "Filters",
+    "name": "Filter",
     "tracks": {
         "OTIO_SCHEMA": "Stack.1", 
         "children": [

diff --git a/data/Patterns.otio → data/Generator.otio b/data/Patterns.otio → data/Generator.otio
@@ -1,7 +1,7 @@
 {
     "OTIO_SCHEMA": "Timeline.1", 
     "metadata": {},
-    "name": "Patterns",
+    "name": "Generator",
     "tracks": {
         "OTIO_SCHEMA": "Stack.1", 
         "children": [
@@ -11,7 +11,7 @@
                     {
                         "OTIO_SCHEMA": "Clip.1",
                         "media_reference": {
-                            "OTIO_SCHEMA": "ExternalReference.1",
+                            "OTIO_SCHEMA": "GeneratorReference.1",
                             "available_range": {
                                 "OTIO_SCHEMA": "TimeRange.1",
                                 "duration": {
@@ -25,16 +25,12 @@
                                     "value": 0
                                 }
                             },
-                            "target_url": "Color_Black.png"
-                        },
-                        "effects": [
-                            {
-                                "OTIO_SCHEMA": "FillEffect.1",
-                                "effect_name": "",
+                            "generator_kind": "Fill",
+                            "parameters": {
                                 "size": [ 1280, 720 ],
                                 "color": [ 1.0, 0.0, 0.0, 1.0 ]
                             }
-                        ],
+                        },
                         "source_range": {
                             "OTIO_SCHEMA": "TimeRange.1",
                             "duration": {
@@ -53,7 +49,7 @@
                     {
                         "OTIO_SCHEMA": "Clip.1",
                         "media_reference": {
-                            "OTIO_SCHEMA": "ExternalReference.1",
+                            "OTIO_SCHEMA": "GeneratorReference.1",
                             "available_range": {
                                 "OTIO_SCHEMA": "TimeRange.1",
                                 "duration": {
@@ -67,18 +63,14 @@
                                     "value": 0
                                 }
                             },
-                            "target_url": "Color_Black.png"
-                        },
-                        "effects": [
-                            {
-                                "OTIO_SCHEMA": "CheckersEffect.1",
-                                "effect_name": "",
+                            "generator_kind": "Checkers",
+                            "parameters": {
                                 "size": [ 1280, 720 ],
                                 "checkerSize": [ 100, 100 ],
                                 "color1": [ 1.0, 1.0, 1.0, 1.0 ],
                                 "color2": [ 0.0, 0.0, 0.0, 1.0 ]
                             }
-                        ],
+                        },
                         "source_range": {
                             "OTIO_SCHEMA": "TimeRange.1",
                             "duration": {
@@ -97,7 +89,7 @@
                     {
                         "OTIO_SCHEMA": "Clip.1",
                         "media_reference": {
-                            "OTIO_SCHEMA": "ExternalReference.1",
+                            "OTIO_SCHEMA": "GeneratorReference.1",
                             "available_range": {
                                 "OTIO_SCHEMA": "TimeRange.1",
                                 "duration": {
@@ -111,21 +103,16 @@
                                     "value": 0
                                 }
                             },
-                            "target_url": "Color_Black.png"
-                        },
-                        "effects": [
-                            {
-                                "OTIO_SCHEMA": "NoiseEffect.1",
-                                "effect_name": "",
-                                "width": 1280,
-                                "height": 720,
+                            "generator_kind": "Noise",
+                            "parameters": {
+                                "size": [ 1280, 720 ],
                                 "type": "gaussian",
                                 "a": 0.0,
                                 "b": 1.0,
                                 "mono": false,
                                 "seed": 0
                             }
-                        ],
+                        },
                         "source_range": {
                             "OTIO_SCHEMA": "TimeRange.1",
                             "duration": {

diff --git a/data/Transforms.otio → data/Transform.otio b/data/Transforms.otio → data/Transform.otio
@@ -1,7 +1,7 @@
 {
     "OTIO_SCHEMA": "Timeline.1", 
     "metadata": {},
-    "name": "Transforms",
+    "name": "Transform",
     "tracks": {
         "OTIO_SCHEMA": "Stack.1", 
         "children": [

diff --git a/lib/toucan/CMakeLists.txt b/lib/toucan/CMakeLists.txt
@@ -2,35 +2,35 @@ set(HEADERS
     Comp.h
     Draw.h
     Filter.h
-    Generator.h
-    TimeWarp.h
-    Transform.h
-    Transition.h
     ImageNode.h
     ImageEffectHost.h
     Init.h
+    Generator.h
     Plugin.h
     PropertySet.h
     Read.h
+    TimeWarp.h
     TimelineGraph.h
+    Transform.h
+    Transition.h
     Transition.h
     Util.h)
 set(HEADERS_PRIVATE)
 set(SOURCE
     Comp.cpp
     Draw.cpp
     Filter.cpp
-    Generator.cpp
-    TimeWarp.cpp
-    Transform.cpp
-    Transition.cpp
     ImageNode.cpp
     ImageEffectHost.cpp
     Init.cpp
+    Generator.cpp
     Plugin.cpp
     PropertySet.cpp
     Read.cpp
+    TimeWarp.cpp
     TimelineGraph.cpp
+    Transform.cpp
+    Transition.cpp
     Transition.cpp
     Util.cpp)
 if(WIN32)