Merge pull request #32 from darbyjohnston/refactor7

Improve error handling
OpenTimelineIO · Dec 10, 2024 · 83d632a · 83d632a
2 parents 42247cb + ebd39a8
commit 83d632a
Show file tree

Hide file tree

Showing 17 changed files with 518 additions and 238 deletions.
diff --git a/data/Filter.otio b/data/Filter.otio
@@ -201,7 +201,7 @@
                                 "OTIO_SCHEMA": "Effect.1",
                                 "effect_name": "toucan:Blur",
                                 "metadata": {
-                                    "radius": 50.0
+                                    "radius": 10.0
                                 }
                             }
                         ],
@@ -245,7 +245,7 @@
                                 "effect_name": "toucan:UnsharpMask",
                                 "metadata": {
                                     "kernel": "gaussian",
-                                    "width": 50.0,
+                                    "width": 10.0,
                                     "contrast": 1.0,
                                     "threshold": 0.0
                                 }

diff --git a/data/MissingMedia.otio b/data/MissingMedia.otio
@@ -0,0 +1,52 @@
+{
+    "OTIO_SCHEMA": "Timeline.1", 
+    "metadata": {},
+    "name": "Gap",
+    "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": 3
+                                },
+                                "start_time": {
+                                    "OTIO_SCHEMA": "RationalTime.1",
+                                    "rate": 24,
+                                    "value": 0
+                                }
+                            },
+                            "target_url": "Letter_None.png"
+                        },
+                        "source_range": {
+                            "OTIO_SCHEMA": "TimeRange.1",
+                            "duration": {
+                                "OTIO_SCHEMA": "RationalTime.1",
+                                "rate": 24,
+                                "value": 3
+                            },
+                            "start_time": {
+                                "OTIO_SCHEMA": "RationalTime.1",
+                                "rate": 24,
+                                "value": 0
+                            }
+                        },
+                        "name": "Letter_None"
+                    }
+                ],
+                "kind": "Video", 
+                "name": "Video"
+            }
+        ], 
+        "name": "Stack"
+    }
+}
diff --git a/data/MissingMedia2.otio b/data/MissingMedia2.otio
@@ -0,0 +1,86 @@
+{
+    "OTIO_SCHEMA": "Timeline.1", 
+    "metadata": {},
+    "name": "Gap",
+    "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": 3
+                                },
+                                "start_time": {
+                                    "OTIO_SCHEMA": "RationalTime.1",
+                                    "rate": 24,
+                                    "value": 0
+                                }
+                            },
+                            "target_url": "Letter_A.png"
+                        },
+                        "source_range": {
+                            "OTIO_SCHEMA": "TimeRange.1",
+                            "duration": {
+                                "OTIO_SCHEMA": "RationalTime.1",
+                                "rate": 24,
+                                "value": 3
+                            },
+                            "start_time": {
+                                "OTIO_SCHEMA": "RationalTime.1",
+                                "rate": 24,
+                                "value": 0
+                            }
+                        },
+                        "name": "Letter_A"
+                    },
+                    {
+                        "OTIO_SCHEMA": "Clip.1",
+                        "media_reference": {
+                            "OTIO_SCHEMA": "ExternalReference.1",
+                            "available_range": {
+                                "OTIO_SCHEMA": "TimeRange.1",
+                                "duration": {
+                                    "OTIO_SCHEMA": "RationalTime.1",
+                                    "rate": 24,
+                                    "value": 3
+                                },
+                                "start_time": {
+                                    "OTIO_SCHEMA": "RationalTime.1",
+                                    "rate": 24,
+                                    "value": 0
+                                }
+                            },
+                            "target_url": "Letter_None.png"
+                        },
+                        "source_range": {
+                            "OTIO_SCHEMA": "TimeRange.1",
+                            "duration": {
+                                "OTIO_SCHEMA": "RationalTime.1",
+                                "rate": 24,
+                                "value": 3
+                            },
+                            "start_time": {
+                                "OTIO_SCHEMA": "RationalTime.1",
+                                "rate": 24,
+                                "value": 0
+                            }
+                        },
+                        "name": "Letter_None"
+                    }
+                ],
+                "kind": "Video", 
+                "name": "Video"
+            }
+        ], 
+        "name": "Stack"
+    }
+}
diff --git a/lib/toucan/FFmpeg.cpp b/lib/toucan/FFmpeg.cpp
@@ -25,7 +25,7 @@ namespace toucan
 
         std::vector<std::string> getVideoExtensions()
         {
-            return std::vector<std::string>({ ".mov", ".mp4", ".m4v" });
+            return std::vector<std::string>({ ".mov", ".mp4", ".m4v", ".y4m" });
         }
 
         bool hasVideoExtension(const std::string& value)

diff --git a/lib/toucan/FFmpegWrite.cpp b/lib/toucan/FFmpegWrite.cpp
@@ -5,6 +5,8 @@
 
 #include "Util.h"
 
+#include <OpenImageIO/imagebufalgo.h>
+
 #include <iostream>
 #include <sstream>
 
@@ -173,7 +175,30 @@ namespace toucan
 
         void Write::writeImage(const OIIO::ImageBuf& buf, const OTIO_NS::RationalTime& time)
         {
-            const auto& spec = buf.spec();
+            auto spec = buf.spec();
+            const OIIO::ImageBuf* bufP = &buf;
+            OIIO::ImageBuf tmp;
+            switch (spec.format.basetype)
+            {
+            case OIIO::TypeDesc::INT8:
+                spec.format.basetype = OIIO::TypeDesc::UINT8;
+                break;
+            case OIIO::TypeDesc::INT16:
+            case OIIO::TypeDesc::UINT32:
+            case OIIO::TypeDesc::INT32:
+            case OIIO::TypeDesc::UINT64:
+            case OIIO::TypeDesc::INT64:
+            case OIIO::TypeDesc::HALF:
+            case OIIO::TypeDesc::FLOAT:
+                spec.format.basetype = OIIO::TypeDesc::UINT16;
+                break;
+            }
+            if (buf.spec().format.basetype != spec.format.basetype)
+            {
+                tmp = OIIO::ImageBufAlgo::copy(buf, spec.format);
+                bufP = &tmp;
+            }
+
             AVPixelFormat avPixelFormatIn = AV_PIX_FMT_NONE;
             switch (spec.nchannels)
             {
@@ -251,7 +276,7 @@ namespace toucan
             av_image_fill_arrays(
                 _avFrame2->data,
                 _avFrame2->linesize,
-                reinterpret_cast<const uint8_t*>(buf.localpixels()),
+                reinterpret_cast<const uint8_t*>(bufP->localpixels()),
                 _avPixelFormatIn,
                 spec.width,
                 spec.height,