Merge remote-tracking branch 'origin/staging' into fix/scene-audio-null-canvas-test

Author: summeroff

.github/workflows/clang-format.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   clang-format-check:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -19,7 +19,8 @@ jobs:
 
       - name: Install clang format
         run: |
-          sudo apt-get install -y clang-format-13
+          sudo apt-get update
+          sudo apt-get install -y clang-format-18
 
       - name: 'Run clang-format'
         run: |

.github/workflows/main.yml

@@ -25,7 +25,7 @@ env:
   SLGenerator: Visual Studio 17 2022
   SLDistributeDirectory: distribute
   SLFullDistributePath: "streamlabs-build.app/distribute" # The .app extension is required to run macOS tests correctly.
-  LibOBSVersion: 31.1.2sl20
+  LibOBSVersion: 32.1.1sl2
   PACKAGE_NAME: osn
 
 jobs:
@@ -303,11 +303,6 @@ jobs:
         run: node ci/bump-version.js "${{ steps.get_version.outputs.VERSION }}" "${{env.PACKAGE_PATH}}"
         env:
           PACKAGE_PATH: "${{env.SLFullDistributePath}}/${{env.InstallPath}}"
-      - name: 'Copy necessary dll files'
-        run: ./ci/copy-files.cmd
-      - name: 'Prepare tag artifact'
-        if: startsWith(github.ref, 'refs/tags/')
-        run: ./ci/prepare-artifact.cmd
       - name: Upload compiled artifacts
         uses: actions/upload-artifact@v4
         with:
@@ -426,6 +421,8 @@ jobs:
         with:
           fetch-depth: 2
           repository: stream-labs/symsrv-scripts
+          # Pinned so a push to symsrv-scripts cannot change this build without a PR here
+          ref: v1.1.1
           path: symsrv-scripts
       - name: Download build artifacts
         uses: actions/download-artifact@v4

.gitignore

@@ -27,3 +27,7 @@ docs/
 streamlabs-build.app
 
 tests/osn-tests/*-cache-local.zip
+
+profile-long-calls/dist/
+!profile-long-calls/.vscode
+profile-long-calls/long_calls.db*

README.md

@@ -33,6 +33,12 @@ cmake --build . --target install --config RelWithDebInfo
 
 This will will download any required dependencies, build the module, and then place it in an archive compatible with npm or yarn that you may specify in a given package.json.
 
+If you are testing a local libobs development package that was built before it bundled its public development dependencies, pass those dependency package prefixes with `OSN_LIBOBS_DEPENDENCY_PREFIX_PATH`. For example:
+
+```
+cmake .. -G"Visual Studio 17 2022" -A x64 -DCMAKE_PREFIX_PATH=%CD%/libobs-src/cmake/ -DOSN_LIBOBS_DEPENDENCY_PREFIX_PATH=D:/path/to/obs/.deps/obs-deps-2025-08-23sl2-x64
+```
+
 ### Mac
 Building on Mac requires Xcode.
 
@@ -172,4 +178,4 @@ If you wish to debug a specific test change the wildcard character to the name o
         }
     ]
 }
-```
+```

ci/check-format.sh

@@ -26,18 +26,18 @@ elif [[ ${OS} = "Darwin" ]] ; then
 fi
 
 # Discover clang-format
-if type clang-format-13 2> /dev/null ; then
-    CLANG_FORMAT=clang-format-13
-elif type clang-format 2> /dev/null ; then
+if command -v clang-format-18 > /dev/null 2>&1 ; then
+    CLANG_FORMAT=clang-format-18
+elif command -v clang-format > /dev/null 2>&1 ; then
     # Clang format found, but need to check version
     CLANG_FORMAT=clang-format
     V=$(clang-format --version)
-    if [[ $V != *"version 13.0"* ]]; then
-        echo "clang-format is not 13.0 (returned ${V})"
+    if [[ $V != *"version 18"* ]]; then
+        echo "clang-format is not 18 (returned ${V})"
         exit 1
     fi
 else
-    echo "No appropriate clang-format found (expected clang-format-13.0.0, or clang-format)"
+    echo "No appropriate clang-format found (expected clang-format-18, or clang-format)"
     exit 1
 fi
 

ci/copy-files.cmd

@@ -10,12 +10,14 @@ const buildDirectory =
   process.env.BUILD_DIRECTORY ||
   "build";
 const buildConfig = process.env.BUILD_CONFIG || process.env.BuildConfig || "RelWithDebInfo";
-const target = "obs_studio_client_unit_tests";
-// Match the TEST_PREFIX passed to catch_discover_tests so ctest only runs this unit-test suite.
-const testPattern = `^${target}::`;
 
-function hasDiscoveredTests() {
-  const testsDirectory = path.join(buildDirectory, "obs-studio-client");
+const testSuites = [
+  { target: "obs_studio_client_unit_tests", sourceDir: "obs-studio-client" },
+  { target: "obs_studio_server_unit_tests", sourceDir: "obs-studio-server" },
+];
+
+function hasDiscoveredTests(target, sourceDir) {
+  const testsDirectory = path.join(buildDirectory, sourceDir);
 
   try {
     return fs
@@ -39,16 +41,18 @@ function run(command, args) {
   }
 }
 
-const skipBuild =
-  process.env.OSN_SKIP_UNIT_TEST_BUILD === "1" ||
-  // Test jobs run from uploaded build artifacts. Building again can force CMake
-  // to reconfigure FetchContent checkouts whose hidden .git directories were not uploaded.
-  (process.env.GITHUB_ACTIONS === "true" && hasDiscoveredTests());
+for (const { target, sourceDir } of testSuites) {
+  const testPattern = `^${target}::`;
 
-if (skipBuild) {
-  console.log("Skipping unit-test build; discovered CTest tests are already present.");
-} else {
-  run("cmake", ["--build", buildDirectory, "--config", buildConfig, "--target", target]);
-}
+  const skipBuild =
+    process.env.OSN_SKIP_UNIT_TEST_BUILD === "1" ||
+    (process.env.GITHUB_ACTIONS === "true" && hasDiscoveredTests(target, sourceDir));
 
-run("ctest", ["--test-dir", buildDirectory, "-C", buildConfig, "--output-on-failure", "-R", testPattern]);
+  if (skipBuild) {
+    console.log(`Skipping build for ${target}; discovered CTest tests are already present.`);
+  } else {
+    run("cmake", ["--build", buildDirectory, "--config", buildConfig, "--target", target]);
+  }
+
+  run("ctest", ["--test-dir", buildDirectory, "-C", buildConfig, "--output-on-failure", "-R", testPattern]);
+}

ci/prepare-artifact.cmd

@@ -697,6 +697,13 @@ export interface IModule {
     readonly binaryPath: string;
     readonly dataPath: string;
 }
+export declare const NDI_RUNTIME_VERSION_MISMATCH = "NDI_RUNTIME_VERSION_MISMATCH";
+export declare const NDI_RUNTIME_NOT_FOUND = "NDI_RUNTIME_NOT_FOUND";
+export interface IObsModuleLoadFailure {
+    module: string;
+    code: string;
+    message: string;
+}
 export declare function addItems(scene: IScene, sceneItems: ISceneItemInfo[]): ISceneItem[];
 export interface FilterInfo {
     name: string;
@@ -801,6 +808,14 @@ export interface IStreaming {
     kbitsPerSec: number;
     dataOutput: number;
 }
+export interface IEnhancedBroadcastingDisplayStats {
+    kbitsPerSec: number;
+    dataOutput: number;
+}
+export interface IEnhancedBroadcastingPerDisplayStats {
+    horizontal: IEnhancedBroadcastingDisplayStats;
+    vertical: IEnhancedBroadcastingDisplayStats;
+}
 export interface EOutputSignal {
     type: string;
     signal: string;
@@ -810,6 +825,12 @@ export interface EOutputSignal {
 export interface IEncoderOption {
     title: string;
     name: string;
+    id: string;
+    family: string;
+    preset: string;
+    codec: string;
+    streaming: boolean;
+    recording: boolean;
 }
 export interface ISimpleStreaming extends IStreaming {
     audioEncoder: IAudioEncoder;
@@ -836,6 +857,7 @@ export interface IAdvancedStreamingFactory {
 }
 export interface IEnhancedBroadcastingAdvancedStreaming extends IAdvancedStreaming {
     additionalVideo?: IVideo;
+    displayStats: IEnhancedBroadcastingPerDisplayStats;
 }
 export interface IEnhancedBroadcastingAdvancedStreamingFactory {
     create(): IEnhancedBroadcastingAdvancedStreaming;
@@ -844,6 +866,7 @@ export interface IEnhancedBroadcastingAdvancedStreamingFactory {
 }
 export interface IEnhancedBroadcastingSimpleStreaming extends ISimpleStreaming {
     additionalVideo?: IVideo;
+    displayStats: IEnhancedBroadcastingPerDisplayStats;
 }
 export interface IEnhancedBroadcastingSimpleStreamingFactory {
     create(): IEnhancedBroadcastingSimpleStreaming;

ci/run-unit-tests.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NodeObs = exports.AdvancedReplayBufferFactory = exports.SimpleReplayBufferFactory = exports.AudioEncoderFactory = exports.AdvancedRecordingFactory = exports.SimpleRecordingFactory = exports.AudioTrackFactory = exports.NetworkFactory = exports.ReconnectFactory = exports.DelayFactory = exports.EnhancedBroadcastingSimpleStreamingFactory = exports.EnhancedBroadcastingAdvancedStreamingFactory = exports.AdvancedStreamingFactory = exports.SimpleStreamingFactory = exports.ServiceFactory = exports.VideoEncoderFactory = exports.IPC = exports.ModuleFactory = exports.AudioFactory = exports.Audio = exports.FaderFactory = exports.VolmeterFactory = exports.TransitionFactory = exports.FilterFactory = exports.SceneFactory = exports.InputFactory = exports.VideoFactory = exports.Video = exports.Global = exports.DefaultPluginPathMac = exports.DefaultPluginDataPath = exports.DefaultPluginPath = exports.DefaultDataPath = exports.DefaultBinPath = exports.DefaultDrawPluginPath = exports.DefaultOpenGLPath = exports.DefaultD3D11Path = void 0;
+exports.NodeObs = exports.NDI_RUNTIME_NOT_FOUND = exports.NDI_RUNTIME_VERSION_MISMATCH = exports.AdvancedReplayBufferFactory = exports.SimpleReplayBufferFactory = exports.AudioEncoderFactory = exports.AdvancedRecordingFactory = exports.SimpleRecordingFactory = exports.AudioTrackFactory = exports.NetworkFactory = exports.ReconnectFactory = exports.DelayFactory = exports.EnhancedBroadcastingSimpleStreamingFactory = exports.EnhancedBroadcastingAdvancedStreamingFactory = exports.AdvancedStreamingFactory = exports.SimpleStreamingFactory = exports.ServiceFactory = exports.VideoEncoderFactory = exports.IPC = exports.ModuleFactory = exports.AudioFactory = exports.Audio = exports.FaderFactory = exports.VolmeterFactory = exports.TransitionFactory = exports.FilterFactory = exports.SceneFactory = exports.InputFactory = exports.VideoFactory = exports.Video = exports.Global = exports.DefaultPluginPathMac = exports.DefaultPluginDataPath = exports.DefaultPluginPath = exports.DefaultDataPath = exports.DefaultBinPath = exports.DefaultDrawPluginPath = exports.DefaultOpenGLPath = exports.DefaultD3D11Path = void 0;
 exports.addItems = addItems;
 exports.createSources = createSources;
 exports.getSourcesSize = getSourcesSize;
@@ -50,6 +50,8 @@ exports.AdvancedReplayBufferFactory = obs.AdvancedReplayBuffer;
 ;
 ;
 ;
+exports.NDI_RUNTIME_VERSION_MISMATCH = 'NDI_RUNTIME_VERSION_MISMATCH';
+exports.NDI_RUNTIME_NOT_FOUND = 'NDI_RUNTIME_NOT_FOUND';
 function addItems(scene, sceneItems) {
     const items = [];
     if (Array.isArray(sceneItems)) {