Merge pull request #35 from darbyjohnston/refactor10

Add context menus

Author: darbyjohnston

bin/toucan-render/App.cpp

@@ -4,6 +4,7 @@
 #include "App.h"
 
 #include <toucanRender/FFmpegWrite.h>
+#include <toucanRender/Read.h>
 #include <toucanRender/Util.h>
 
 #include <dtk/core/CmdLine.h>
@@ -209,7 +210,7 @@ namespace toucan
 
         // Open the movie file.
         std::shared_ptr<ffmpeg::Write> ffWrite;
-        if (ffmpeg::hasVideoExtension(outputPath.extension().string()))
+        if (MovieReadNode::hasExtension(outputPath.extension().string()))
         {
             ffmpeg::VideoCodec videoCodec = ffmpeg::VideoCodec::First;
             ffmpeg::fromString(_options.videoCodec, videoCodec);

cmake/SuperBuild/Builddtk-deps.cmake

@@ -1,7 +1,7 @@
 include(ExternalProject)
 
 set(dtk_GIT_REPOSITORY "https://github.com/darbyjohnston/dtk.git")
-set(dtk_GIT_TAG "f9bb41e9e45ce50c34e02dafe2b88f01985eed61")
+set(dtk_GIT_TAG "24600e0d096205733c2adceb3ffc7b330c5402f9")
 
 set(dtk-deps_ARGS
     ${toucan_EXTERNAL_PROJECT_ARGS}

cmake/SuperBuild/Builddtk.cmake

@@ -1,7 +1,7 @@
 include(ExternalProject)
 
 set(dtk_GIT_REPOSITORY "https://github.com/darbyjohnston/dtk.git")
-set(dtk_GIT_TAG "f9bb41e9e45ce50c34e02dafe2b88f01985eed61")
+set(dtk_GIT_TAG "24600e0d096205733c2adceb3ffc7b330c5402f9")
 
 set(dtk_DEPS dtk-deps)
 set(dtk_ARGS

lib/toucanRender/FFmpeg.cpp

@@ -3,6 +3,8 @@
 
 #include "FFmpeg.h"
 
+#include "Util.h"
+
 extern "C"
 {
 #include <libavcodec/avcodec.h>
@@ -21,18 +23,6 @@ namespace toucan
             return AVRational({ value.den, value.num });
         }
 
-        std::vector<std::string> getVideoExtensions()
-        {
-            return std::vector<std::string>({ ".mov", ".mp4", ".m4v", ".y4m" });
-        }
-
-        bool hasVideoExtension(const std::string& value)
-        {
-            const std::vector<std::string> extensions = getVideoExtensions();
-            const auto i = std::find(extensions.begin(), extensions.end(), value);
-            return i != extensions.end();
-        }
-
         namespace
         {
             std::vector<std::pair<int, std::string> > _getVideoCodecs()

lib/toucanRender/FFmpeg.h

@@ -20,12 +20,6 @@ namespace toucan
         //! Swap the numerator and denominator.
         AVRational swap(AVRational);
 
-        //! Get a list of supported video extensions.
-        std::vector<std::string> getVideoExtensions();
-
-        //! Check if the given extension is supported.
-        bool hasVideoExtension(const std::string&);
-
         //! Video codecs.
         enum class VideoCodec
         {

lib/toucanRender/ImageGraph.cpp

@@ -57,9 +57,17 @@ namespace toucan
             {
                 try
                 {
-                    auto read = std::make_shared<ReadNode>(
-                        _timelineWrapper->getMediaPath(externalRef->target_url()),
-                        _timelineWrapper->getMemoryReference(externalRef->target_url()));
+                    const std::filesystem::path path = _timelineWrapper->getMediaPath(externalRef->target_url());
+                    const MemoryReference mem = _timelineWrapper->getMemoryReference(externalRef->target_url());
+                    std::shared_ptr<IReadNode> read;
+                    if (MovieReadNode::hasExtension(path.extension().string()))
+                    {
+                        read = std::make_shared<MovieReadNode>(path, mem);
+                    }
+                    else
+                    {
+                        read = std::make_shared<ImageReadNode>(path, mem);
+                    }
                     const auto& spec = read->getSpec();
                     if (spec.width > 0)
                     {
@@ -338,14 +346,21 @@ namespace toucan
             // Get the media reference.
             if (auto externalRef = dynamic_cast<OTIO_NS::ExternalReference*>(clip->media_reference()))
             {
-                std::shared_ptr<ReadNode> read;
+                std::shared_ptr<IReadNode> read;
                 if (!_loadCache.get(externalRef, read))
                 {
                     try
                     {
-                        read = std::make_shared<ReadNode>(
-                            _timelineWrapper->getMediaPath(externalRef->target_url()),
-                            _timelineWrapper->getMemoryReference(externalRef->target_url()));
+                        const std::filesystem::path path = _timelineWrapper->getMediaPath(externalRef->target_url());
+                        const MemoryReference mem = _timelineWrapper->getMemoryReference(externalRef->target_url());
+                        if (MovieReadNode::hasExtension(path.extension().string()))
+                        {
+                            read = std::make_shared<MovieReadNode>(path, mem);
+                        }
+                        else
+                        {
+                            read = std::make_shared<ImageReadNode>(path, mem);
+                        }
                     }
                     catch (const std::exception& e)
                     {

lib/toucanRender/ImageGraph.h

@@ -18,7 +18,7 @@
 
 namespace toucan
 {
-    class ReadNode;
+    class IReadNode;
 
     //! Create image graphs from a timeline.
     class ImageGraph : public std::enable_shared_from_this<ImageGraph>
@@ -70,6 +70,6 @@ namespace toucan
         IMATH_NAMESPACE::V2i _imageSize = IMATH_NAMESPACE::V2i(0, 0);
         int _imageChannels = 0;
         std::string _imageDataType;
-        dtk::LRUCache<OTIO_NS::MediaReference*, std::shared_ptr<ReadNode> > _loadCache;
+        dtk::LRUCache<OTIO_NS::MediaReference*, std::shared_ptr<IReadNode> > _loadCache;
     };
 }