Time refactoring

.github/workflows/ci-workflow.yml

@@ -25,6 +25,7 @@ jobs:
         echo "LD_LIBRARY_PATH=$PWD/install-Debug/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
         sudo apt-get update
         sudo apt-get install xorg-dev libglu1-mesa-dev mesa-common-dev mesa-utils xvfb
+        cmake --version
 
     - name: Build
       run: sh toucan/sbuild-linux.sh Debug
@@ -53,9 +54,10 @@ jobs:
         echo "LD_LIBRARY_PATH=$PWD/install-Release/lib:$LD_LIBRARY_PATH" >> $GITHUB_ENV
         sudo apt-get update
         sudo apt-get install xorg-dev libglu1-mesa-dev mesa-common-dev mesa-utils xvfb
+        cmake --version
 
     - name: Build
-      run: sh toucan/sbuild-macos.sh
+      run: sh toucan/sbuild-linux.sh
 
     - name: Install
       run: cmake --build build-Release --config Release --target install
@@ -76,33 +78,6 @@ jobs:
     - name: Upload artifact URL
       run: echo 'Artifact URL ${{ steps.linux-package-artifact.outputs.artifact-url }}'
 
-  macos-13-build:
-    runs-on: macos-13
-
-    env:
-      FFMPEG_MINIMAL: ON
-
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        path: toucan
-        submodules: recursive
-
-    # \bug DYLD_LIBRARY_PATH is not being set here?
-    - name: Setup
-      run: |
-        echo "$PWD/install-Debug/bin" >> $GITHUB_PATH
-        echo "DYLD_LIBRARY_PATH=$PWD/install-Debug/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
-
-    - name: Build
-      run: sh toucan/sbuild-macos.sh Debug
-
-    - name: Install
-      run: cmake --build build-Debug --config Debug --target install
-
-    - name: Tests
-      run: build-Debug/tests/toucan-test/toucan-test toucan/data
-
   macos-build:
     runs-on: macos-latest
 
@@ -120,6 +95,7 @@ jobs:
       run: |
         echo "$PWD/install-Debug/bin" >> $GITHUB_PATH
         echo "DYLD_LIBRARY_PATH=$PWD/install-Debug/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
+        cmake --version
 
     - name: Build
       run: sh toucan/sbuild-macos.sh Debug
@@ -147,6 +123,7 @@ jobs:
       run: |
         echo "$PWD/install-Debug/bin" >> $GITHUB_PATH
         echo "DYLD_LIBRARY_PATH=$PWD/install-Debug/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
+        cmake --version
 
     - name: Build
       run: bash toucan/sbuild-macos.sh
@@ -190,6 +167,7 @@ jobs:
         echo %CD%\install-Debug\bin>> %GITHUB_PATH%
         echo %CD%\install-Debug\lib>> %GITHUB_PATH%
         echo CTEST_OUTPUT_ON_FAILURE=1 >> %GITHUB_ENV%
+        cmake --version
 
     - name: Build
       shell: cmd
@@ -222,6 +200,7 @@ jobs:
       run: |
         echo %CD%\install-Debug\bin>> %GITHUB_PATH%
         echo %CD%\install-Debug\lib>> %GITHUB_PATH%
+        cmake --version
 
     - name: Build
       shell: cmd

bin/toucan-render/App.cpp

@@ -200,7 +200,7 @@ namespace toucan
 
         // Open the movie file.
         std::shared_ptr<ffmpeg::Write> ffWrite;
-        if (MovieReadNode::hasExtension(outputPath.extension().string()))
+        if (hasExtension(outputPath.extension().string(), MovieReadNode::getExtensions()))
         {
             ffmpeg::VideoCodec videoCodec = ffmpeg::VideoCodec::MJPEG;
             if (_cmdLine.videoCodec->hasValue())

cmake/SuperBuild/BuildOpenImageIO.cmake

@@ -1,7 +1,7 @@
 include(ExternalProject)
 
 set(OpenImageIO_GIT_REPOSITORY "https://github.com/AcademySoftwareFoundation/OpenImageIO.git")
-set(OpenImageIO_GIT_TAG "v3.0.9.1")
+set(OpenImageIO_GIT_TAG "v3.0.10.0")
 
 set(OpenImageIO_DEPS)
 if(toucan_PNG)

cmake/SuperBuild/Buildexpat.cmake

@@ -7,7 +7,8 @@ set(expat_ARGS
     ${toucan_EXTERNAL_PROJECT_ARGS}
     -DEXPAT_BUILD_TOOLS=OFF
     -DEXPAT_BUILD_EXAMPLES=OFF
-    -DEXPAT_BUILD_TESTS=OFF)
+    -DEXPAT_BUILD_TESTS=OFF
+    -DCMAKE_POLICY_VERSION_MINIMUM=3.5)
 
 ExternalProject_Add(
     expat

cmake/SuperBuild/Buildpystring.cmake

@@ -3,7 +3,9 @@ include(ExternalProject)
 set(pystring_GIT_REPOSITORY "https://github.com/imageworks/pystring.git")
 set(pystring_GIT_TAG "v1.1.4")
 
-set(pystring_ARGS ${toucan_EXTERNAL_PROJECT_ARGS})
+set(pystring_ARGS
+    -DCMAKE_POLICY_VERSION_MINIMUM=3.5
+    ${toucan_EXTERNAL_PROJECT_ARGS})
 
 ExternalProject_Add(
     pystring

cmake/SuperBuild/Buildyaml-cpp.cmake

@@ -7,7 +7,8 @@ set(yaml-cpp_ARGS
     ${toucan_EXTERNAL_PROJECT_ARGS}
     -DYAML_CPP_BUILD_CONTRIB=OFF
     -DYAML_CPP_BUILD_TOOLS=OFF
-    -DYAML_CPP_BUILD_TESTS=OFF)
+    -DYAML_CPP_BUILD_TESTS=OFF
+    -DCMAKE_POLICY_VERSION_MINIMUM=3.5)
 
 ExternalProject_Add(
     yaml-cpp

lib/CMakeLists.txt

@@ -1,3 +1,4 @@
+add_subdirectory(toucanResource)
 add_subdirectory(toucanRender)
 if(toucan_VIEW)
     add_subdirectory(toucanView)

lib/toucanRender/CMakeLists.txt

@@ -45,6 +45,7 @@ endif()
 
 add_library(toucanRender ${HEADERS} ${HEADERS_PRIVATE} ${SOURCE})
 set(LIBS_PUBLIC
+    toucanResource
     ftk::feather-tk-core
     OTIO::opentimelineio
     OTIO::opentime

lib/toucanRender/Comp.cpp

@@ -29,16 +29,9 @@ namespace toucan
     OIIO::ImageBuf CompNode::exec()
     {
         OIIO::ImageBuf buf;
-        OTIO_NS::RationalTime offsetTime = _time;
-        if (!_timeOffset.is_invalid_time())
-        {
-            offsetTime -= _timeOffset;
-        }
         if (_inputs.size() > 1 && _inputs[0] && _inputs[1])
         {
-            _inputs[0]->setTime(offsetTime);
             auto fgBuf = _inputs[0]->exec();
-            _inputs[1]->setTime(offsetTime);
             buf = _inputs[1]->exec();
             const auto fgSpec = fgBuf.spec();
             if (_premult &&
@@ -81,7 +74,6 @@ namespace toucan
         }
         else if (1 == _inputs.size() && _inputs[0])
         {
-            _inputs[0]->setTime(offsetTime);
             buf = _inputs[0]->exec();
             if (_premult)
             {

lib/toucanRender/ImageEffect.cpp

@@ -78,12 +78,6 @@ namespace toucan
     {
         OIIO::ImageBuf out;
 
-        OTIO_NS::RationalTime offsetTime = _time;
-        if (!_timeOffset.is_invalid_time())
-        {
-            offsetTime -= _timeOffset;
-        }
-
         // Initialize the images.
         std::vector<OIIO::ImageBuf> inputs;
         IMATH_NAMESPACE::V2i size = IMATH_NAMESPACE::V2i(0, 0);
@@ -104,7 +98,6 @@ namespace toucan
             !_inputs.empty() &&
             _inputs[0])
         {
-            _inputs[0]->setTime(offsetTime);
             inputs.push_back(_inputs[0]->exec());
             auto spec = inputs[0].spec();
             if (size.x > 0 && size.y > 0)
@@ -122,9 +115,7 @@ namespace toucan
             _inputs[0] &&
             _inputs[1])
         {
-            _inputs[0]->setTime(offsetTime);
             inputs.push_back(_inputs[0]->exec());
-            _inputs[1]->setTime(offsetTime);
             inputs.push_back(_inputs[1]->exec());
             auto spec = inputs[0].spec();
             if (size.x > 0 && size.y > 0)
@@ -143,7 +134,7 @@ namespace toucan
         if (spec.width > 0 && spec.height > 0)
         {
             PropertySet args;
-            args.setDouble(kOfxPropTime, 0, offsetTime.value());
+            args.setDouble(kOfxPropTime, 0, _time.value());
             OfxRectI bounds;
             bounds.x1 = 0;
             bounds.x2 = spec.width;