Refactoring

darbyjohnston · darbyjohnston · commit e65b60d743b7 · 2024-08-11T16:20:42.000-07:00
diff --git a/data/Transition.otio b/data/Transition.otio
@@ -74,7 +74,7 @@
                                     "value": 0
                                 }
                             },
-                            "target_url": "Counter.2.png"
+                            "target_url": "ColorBars.png"
                         },
                         "source_range": {
                             "OTIO_SCHEMA": "TimeRange.1",
@@ -89,7 +89,7 @@
                                 "value": 5
                             }
                         },
-                        "name": "Counter 2"
+                        "name": "Color Bars"
                     }
                 ],
                 "kind": "Video", 
diff --git a/data/Transition2.otio b/data/Transition2.otio
@@ -0,0 +1,113 @@
+{
+    "OTIO_SCHEMA": "Timeline.1", 
+    "metadata": {},
+    "name": "Transition",
+    "tracks": {
+        "OTIO_SCHEMA": "Stack.1", 
+        "children": [
+            {
+                "OTIO_SCHEMA": "Track.1", 
+                "children": [
+                    {
+                        "OTIO_SCHEMA": "Clip.1",
+                        "media_reference": {
+                            "OTIO_SCHEMA": "ExternalReference.1",
+                            "available_range": {
+                                "OTIO_SCHEMA": "TimeRange.1",
+                                "duration": {
+                                    "OTIO_SCHEMA": "RationalTime.1",
+                                    "rate": 24,
+                                    "value": 15
+                                },
+                                "start_time": {
+                                    "OTIO_SCHEMA": "RationalTime.1",
+                                    "rate": 24,
+                                    "value": 0
+                                }
+                            },
+                            "target_url": "Counter.0.png"
+                        },
+                        "effects": [
+                            {
+                                "OTIO_SCHEMA": "InvertEffect.1",
+                                "effect_name": ""
+                            }
+                        ],
+                        "source_range": {
+                            "OTIO_SCHEMA": "TimeRange.1",
+                            "duration": {
+                                "OTIO_SCHEMA": "RationalTime.1",
+                                "rate": 24,
+                                "value": 10
+                            },
+                            "start_time": {
+                                "OTIO_SCHEMA": "RationalTime.1",
+                                "rate": 24,
+                                "value": 0
+                            }
+                        },
+                        "name": "Counter"
+                    },
+                    {
+                        "OTIO_SCHEMA": "Transition.1",
+                        "name": "Dissolve",
+                        "transition_type": "SMPTE_Dissolve",
+                        "in_offset": {
+                          "OTIO_SCHEMA": "RationalTime.1",
+                          "rate": 24,
+                          "value": 5
+                        },
+                        "out_offset": {
+                          "OTIO_SCHEMA": "RationalTime.1",
+                          "rate": 24,
+                          "value": 5
+                        }
+                    },
+                    {
+                        "OTIO_SCHEMA": "Clip.1",
+                        "media_reference": {
+                            "OTIO_SCHEMA": "ExternalReference.1",
+                            "available_range": {
+                                "OTIO_SCHEMA": "TimeRange.1",
+                                "duration": {
+                                    "OTIO_SCHEMA": "RationalTime.1",
+                                    "rate": 24,
+                                    "value": 15
+                                },
+                                "start_time": {
+                                    "OTIO_SCHEMA": "RationalTime.1",
+                                    "rate": 24,
+                                    "value": 0
+                                }
+                            },
+                            "target_url": "ColorBars.png"
+                        },
+                        "effects": [
+                            {
+                                "OTIO_SCHEMA": "InvertEffect.1",
+                                "effect_name": ""
+                            }
+                        ],
+                        "source_range": {
+                            "OTIO_SCHEMA": "TimeRange.1",
+                            "duration": {
+                                "OTIO_SCHEMA": "RationalTime.1",
+                                "rate": 24,
+                                "value": 10
+                            },
+                            "start_time": {
+                                "OTIO_SCHEMA": "RationalTime.1",
+                                "rate": 24,
+                                "value": 5
+                            }
+                        },
+                        "name": "Color Bars"
+                    }
+                ],
+                "kind": "Video", 
+                "name": "Video"
+            }
+        ], 
+        "name": "Stack"
+    }
+}
diff --git a/lib/toucan/TimelineTraverse.cpp b/lib/toucan/TimelineTraverse.cpp
@@ -23,7 +23,7 @@ namespace toucan
         _path(path),
         _timeline(timeline)
     {
-        // The first clip sets the timeline resolution.
+        // Get the image size from the first clip.
         for (auto clip : _timeline->find_clips())
         {
             if (auto externalRef = dynamic_cast<OTIO_NS::ExternalReference*>(clip->media_reference()))
@@ -140,6 +140,7 @@ namespace toucan
                 }
             }
 
+            // Handle transitions.
             if (op)
             {
                 if (auto prevTransition = dynamic_cast<OTIO_NS::Transition*>(prevComposable(i.value)))
@@ -178,7 +179,7 @@ namespace toucan
                 }
             }
 
-            // Composite.
+            // Composite over the previous track.
             std::vector<std::shared_ptr<IImageOp> > ops;
             if (op)
             {
@@ -234,7 +235,7 @@ namespace toucan
             out = std::make_shared<FillOp>(FillData{ _size });
         }
 
-        // Create the effects.
+        // Get the effects.
         for (const auto& effect : item->effects())
         {
             if (auto iEffect = dynamic_cast<IEffect*>(effect.value))
diff --git a/tests/TimelineTraverseTest.cpp b/tests/TimelineTraverseTest.cpp
@@ -23,6 +23,7 @@ namespace toucan
             "Patterns",
             "Text",
             "Transition",
+            "Transition2",
             "Transforms"
         };
         for (const auto& otioFile : otioFiles)

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@`
`74`	`74`	`"value": 0`
`75`	`75`	`}`
`76`	`76`	`},`
`77`		`- "target_url": "Counter.2.png"`
	`77`	`+ "target_url": "ColorBars.png"`
`78`	`78`	`},`
`79`	`79`	`"source_range": {`
`80`	`80`	`"OTIO_SCHEMA": "TimeRange.1",`
`@@ -89,7 +89,7 @@`
`89`	`89`	`"value": 5`
`90`	`90`	`}`
`91`	`91`	`},`
`92`		`- "name": "Counter 2"`
	`92`	`+ "name": "Color Bars"`
`93`	`93`	`}`
`94`	`94`	`],`
`95`	`95`	`"kind": "Video",`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ namespace toucan`
`23`	`23`	`_path(path),`
`24`	`24`	`_timeline(timeline)`
`25`	`25`	`{`
`26`		`- // The first clip sets the timeline resolution.`
	`26`	`+ // Get the image size from the first clip.`
`27`	`27`	`for (auto clip : _timeline->find_clips())`
`28`	`28`	`{`
`29`	`29`	`if (auto externalRef = dynamic_cast<OTIO_NS::ExternalReference*>(clip->media_reference()))`
`@@ -140,6 +140,7 @@ namespace toucan`
`140`	`140`	`}`
`141`	`141`	`}`
`142`	`142`
	`143`	`+ // Handle transitions.`
`143`	`144`	`if (op)`
`144`	`145`	`{`
`145`	`146`	`if (auto prevTransition = dynamic_cast<OTIO_NS::Transition*>(prevComposable(i.value)))`
`@@ -178,7 +179,7 @@ namespace toucan`
`178`	`179`	`}`
`179`	`180`	`}`
`180`	`181`
`181`		`- // Composite.`
	`182`	`+ // Composite over the previous track.`
`182`	`183`	`std::vector<std::shared_ptr<IImageOp> > ops;`
`183`	`184`	`if (op)`
`184`	`185`	`{`
`@@ -234,7 +235,7 @@ namespace toucan`
`234`	`235`	`out = std::make_shared<FillOp>(FillData{ _size });`
`235`	`236`	`}`
`236`	`237`
`237`		`- // Create the effects.`
	`238`	`+ // Get the effects.`
`238`	`239`	`for (const auto& effect : item->effects())`
`239`	`240`	`{`
`240`	`241`	`if (auto iEffect = dynamic_cast<IEffect*>(effect.value))`