Merge branch 'main' into vulkna-10bit-windows

Author: cedrik-fuoco-adsk

.github/actions/build-linux/action.yml

@@ -50,12 +50,22 @@ runs:
       run: df -h /
       shell: bash
 
-    # Rocky 9.8 dropped mesa-libOSMesa{,-devel} from the CRB repo. Pin all
-    # subsequent dnf calls in this container to the 9.7 minor release until
-    # OpenRV migrates off OSMesa. Remove this step once that's done.
-    - name: Pin Rocky 9 to 9.7 minor release
+    # Rocky 9.8 dropped mesa-libOSMesa{,-devel} from the CRB repo (Mesa upstream
+    # deprecated OSMesa in favor of llvmpipe via EGL). Pin all subsequent dnf
+    # calls in this container to the 9.7 minor release until OpenRV migrates off
+    # OSMesa. 9.7 is now a superseded minor, so the production CDN no longer
+    # serves it (the default 'extras' repo 404s); point the pinned repos at the
+    # durable vault archive (dl.rockylinux.org/vault) instead. Remove this whole
+    # step once OpenRV no longer needs OSMesa.
+    - name: Pin Rocky 9 to 9.7 minor release (vault)
       if: ${{ inputs.rocky-version == '9' }}
-      run: echo "9.7" > /etc/dnf/vars/releasever
+      run: |
+        echo "9.7" > /etc/dnf/vars/releasever
+        sed -i \
+          -e 's|^mirrorlist=|#mirrorlist=|g' \
+          -e 's|^#\?baseurl=https\?://dl.rockylinux.org/\$contentdir/|baseurl=https://dl.rockylinux.org/vault/rocky/|g' \
+          /etc/yum.repos.d/[Rr]ocky*.repo
+        dnf clean all
       shell: bash
 
     - name: Install system dependencies

.github/workflows/conan.yml

@@ -100,9 +100,15 @@ jobs:
       # Rocky 9.8 dropped mesa-libOSMesa{,-devel} from the CRB repo. Pin all
       # subsequent dnf calls in this container to the 9.7 minor release until
       # OpenRV migrates off OSMesa. Remove this step once that's done.
-      - name: Pin Rocky 9 to 9.7 minor release
+      - name: Pin Rocky 9 to 9.7 minor release (vault)
         if: ${{ matrix.rocky-version == '9' }}
-        run: echo "9.7" > /etc/dnf/vars/releasever
+        run: |
+          echo "9.7" > /etc/dnf/vars/releasever
+          sed -i \
+            -e 's|^mirrorlist=|#mirrorlist=|g' \
+            -e 's|^#\?baseurl=https\?://dl.rockylinux.org/\$contentdir/|baseurl=https://dl.rockylinux.org/vault/rocky/|g' \
+            /etc/yum.repos.d/[Rr]ocky*.repo
+          dnf clean all
 
       - name: Install system dependencies
         run: |

.gitignore

@@ -49,3 +49,6 @@ rvnuke_mode.mu
 *_rc.py
 # see generate_about_rv.py
 about_rv.cpp
+
+# Dear ImgGui generated
+imgui.ini

.gitmodules

@@ -3,4 +3,7 @@
 	url = https://github.com/shotgunsoftware/openrv-WFObj.git
 [submodule "src/pub"]
 	path = src/pub
-	url = https://github.com/shotgunsoftware/openrv-pub.git
+	url = https://github.com/shotgunsoftware/openrv-pub.git
+[submodule "src/lib/geometry/twkpaint-src"]
+	path = src/lib/geometry/twkpaint-src
+	url = https://github.com/AcademySoftwareFoundation/OpenRV-annotation.git

cmake/defaults/rv_options.cmake

@@ -95,7 +95,7 @@ SET(RV_FFMPEG_SUPPORTED_OPTIONS
 )
 # Default option
 SET(_RV_FFMPEG
-    "6"
+    "8"
 )
 
 IF(DEFINED RV_FFMPEG)

cmake/dependencies/ffmpeg.cmake

@@ -234,6 +234,24 @@ IF(NOT RV_FFMPEG_CONFIG_OPTIONS)
       "vp9_v4l2m2m"
   )
 
+  # FFmpeg 8 introduced the prores_raw decoder, which (like the prores decoder) pulls in libavcodec/x86/proresdsp_init.o. That C init references the SSE2 asm
+  # symbol ff_prores_idct_put_10_sse2, but the asm that defines it (x86/proresdsp.o) is only built when CONFIG_PRORES_DECODER is enabled. Because we disable the
+  # non-free prores decoder above, leaving prores_raw enabled produces an undefined symbol in libavcodec on x86 (mio_ffmpeg fails to dlopen). Disable prores_raw
+  # too for consistency with our non-free ProRes policy. Guarded on RV_FFMPEG_8 since the decoder does not exist in FFmpeg 6/7 and --disable-decoder on an
+  # unknown decoder makes FFmpeg's configure fail.
+  IF(RV_FFMPEG_8)
+    LIST(APPEND NON_FREE_DECODERS_TO_DISABLE "prores_raw")
+
+    # We disable the non-free ac3 decoder above, which (via eac3_decoder_select="ac3_decoder") also disables the eac3 decoder, so CONFIG_EAC3_DECODER=0. But the
+    # ac3_fixed decoder is left enabled, so libavcodec/ac3dec_fixed.c (which #includes ac3dec.c) is still compiled. With eac3 disabled, eac3dec.c -- which
+    # defines the static ff_eac3_parse_header -- is never included into that TU, yet ac3dec.c still names the symbol in its `if (CONFIG_EAC3_DECODER)` branch.
+    # GCC/Clang dead-code-eliminate the dead branch and only warn, but MSVC treats the referenced-but-undefined static as a fatal error C2129, breaking the
+    # FFmpeg 8 build on Windows. ac3_fixed is the same non-free AC3 codec, so disable it (and eac3 explicitly) to drop the offending TU. Guarded on RV_FFMPEG_8
+    # to keep the existing FFmpeg 6/7 builds unchanged.
+    LIST(APPEND NON_FREE_DECODERS_TO_DISABLE "ac3_fixed")
+    LIST(APPEND NON_FREE_DECODERS_TO_DISABLE "eac3")
+  ENDIF()
+
   FOREACH(
     NON_FREE_DECODER_TO_DISABLE
     ${NON_FREE_DECODERS_TO_DISABLE}

cmake/dependencies/openssl.cmake

@@ -244,11 +244,7 @@ ENDIF()
 # For found packages, expose the pkgconfig directory so FFmpeg's configure can detect OpenSSL via pkg-config. This is critical on Windows where FFmpeg's
 # fallback `-lssl -lcrypto` translates to `ssl.lib`/`crypto.lib` (MSVC literal name), but vcpkg/OpenSSL 3.x ships `libssl.lib`/`libcrypto.lib`. The .pc files
 # contain the correct `-llibssl -llibcrypto` flags. On Unix this is also useful when the found package is in a non-standard prefix.
-IF(${_target}_FOUND
-   AND EXISTS "${_lib_dir}/pkgconfig"
+SET_PROPERTY(
+  GLOBAL APPEND
+  PROPERTY "RV_DEPS_PKG_CONFIG_PATH" "${_lib_dir}/pkgconfig"
 )
-  SET_PROPERTY(
-    GLOBAL APPEND
-    PROPERTY "RV_DEPS_PKG_CONFIG_PATH" "${_lib_dir}/pkgconfig"
-  )
-ENDIF()

src/build/requirements.txt.in

@@ -15,6 +15,7 @@ numpy==@_numpy_version@ # License: BSD License (BSD-3-Clause) - Required by PySi
 opentimelineio @ git+https://github.com/cedrik-fuoco-adsk/OpenTimelineIO.git@fix-windows-debug-crash # License: Other/Proprietary License (Modified Apache 2.0 License)
 PyOpenGL==3.1.7         # License: BSD License (BSD)
 PyOpenGL_accelerate==3.1.10 # License: BSD License (BSD) - v3.1.10 includes Python 3 fix for Cython compatibility
+psutil==7.2.2           # License: BSD License (BSD-3-Clause)
 
 # Additional packages required by RV and for testing the Python distribution
 

src/lib/app/RvApp/RvSession.cpp

@@ -701,7 +701,7 @@ namespace Rv
             if (string(extension(infiles[i])) == "rv")
                 ++rvFileCount;
 
-        if (rvFileCount > 1)
+        if (rvFileCount && infiles.size() > 1)
             merge = true;
 
         //  PROGLOAD  this func should take tag for when called from mu
@@ -3920,7 +3920,37 @@ namespace Rv
             setSequenceEvents();
     }
 
-    void RvSession::onGraphMediaSetEmpty() { userGenericEvent("after-progressive-loading", ""); }
+    void RvSession::onGraphMediaSetEmpty()
+    {
+        // The media-loading set can become transiently empty *between* sources
+        // while we are still progressively adding the sources of a single load
+        // request (e.g. when dropping multiple files). continueLoading() adds
+        // one source per event-loop iteration, so source N can finish loading
+        // in the gap before source N+1 starts, momentarily emptying the set.
+        //
+        // While m_loadState is still alive, more sources are about to be added
+        // and more media will start loading, so an empty set here is only
+        // transient. Emitting after-progressive-loading in that case would
+        // produce one after-progressive-loading event per source for a single
+        // before-progressive-loading event.
+        //
+        // We therefore only emit the event once the load request has been fully
+        // consumed (m_loadState == nullptr), i.e. once every source has been
+        // added and all of their media have finished loading. This guarantees a
+        // single after-progressive-loading event matching the single
+        // before-progressive-loading event.
+        //
+        // Note: this runs on the main thread (media completion is marshalled via
+        // dispatchToMainThread), serialized with continueLoading() which deletes
+        // m_loadState before returning -- so this read of m_loadState is safe and
+        // always observes the final state.
+        if (m_loadState != nullptr)
+        {
+            return;
+        }
+
+        userGenericEvent("after-progressive-loading", "");
+    }
 
     // connects events from the sequence IP node
     //

src/lib/app/RvCommon/RvApplication.cpp

@@ -908,11 +908,20 @@ namespace Rv
         //
         s->userGenericEvent("session-initialized", "");
 
-        if (s->loadTotal() == 0)
         //
-        //  We will not be loading media at all, so send
-        //  after-progressive-loading event.
+        //  If files were requested but none of them resulted in any media to
+        //  load (loadTotal() == 0), the asynchronous loading mechanism will
+        //  never emit the after-progressive-loading event that closes the
+        //  before-progressive-loading event emitted while processing those
+        //  files, so we emit it here.
         //
+        //  However, when no files were requested at all (e.g. launching RV with
+        //  an empty session), no before-progressive-loading event was ever
+        //  emitted, so emitting after-progressive-loading here would produce an
+        //  unmatched event. We therefore only emit it when files were actually
+        //  requested.
+        //
+        if (s->loadTotal() == 0 && !files.empty())
         {
             s->userGenericEvent("after-progressive-loading", "");
         }