@@ -1,4 +1,20 @@

 -------------------------------------------------------------------

+Fri Mar 07 23:49:06 UTC 2025 - packman@nordisch.org

+

+- Update to version 31.0.2:

+  * libobs: Update version to 31.0.2

+  * mac-avcapture: Prevent race condition in source init/deinit

+  * win-dshow: Fix possible crash if frame width or height is zero

+  * obs-browser: Update version to 2.24.5

+  * obs-websocket: Update version to 5.5.5

+  * obs-nvenc: Fix lookahead depth value logging

+  * obs-nvenc: Correct max target quality for AV1

+  * cmake: Fix regexp to detect installed FFmpeg version

+  * nv-filters: Remove CUDA RT functions

+  * nv-filters: Update SDK version targeted

+  * obs-scripting: Fix macOS Homebrew Python loading

+

+-------------------------------------------------------------------

 Mon Jan 20 09:57:57 UTC 2025 - darix <packman@nordisch.org>

 - make nvenc handling more readable

​

@@ -35,7 +35,7 @@

 %endif

 Name:           obs-studio

-Version:        31.0.1

+Version:        31.0.2

 Release:        0

 Summary:        A recording/broadcasting program

 Group:          Productivity/Multimedia/Video/Editors and Convertors

​

@@ -1,7 +1,7 @@

 <services>

   <service name="tar_scm" mode="disabled">

     <param name="versionformat">@PARENT_TAG@</param>

-    <param name="revision">31.0.1</param>

+    <param name="revision">31.0.2</param>

     <param name="url">https://github.com/obsproject/obs-studio.git</param>

     <param name="versionrewrite-pattern">(\.\d+)-(a-z.*)</param>

     <param name="versionrewrite-replacement">\1~\2</param>

​

@@ -1,6 +1,6 @@

 <servicedata>

   <service name="tar_scm">

     <param name="url">https://github.com/obsproject/obs-studio.git</param>

-    <param name="changesrevision">b7b7c4cbbcd86eb29d8bbc51765be0338ed6814d</param>

+    <param name="changesrevision">e6137e15e0fb26b3aa47a66df28e9f056d54b9af</param>

   </service>

 </servicedata>

\ No newline at end of file

​

@@ -17,8 +17,8 @@

     "sources": 

         {

             "type": "archive",

-            "url": "https://cdn-fastly.obsproject.com/downloads/cef_binary_6533_linux_x86_64.tar.xz",

-            "sha256": "fab66dfc9cfd2e26fb87798f855aef30c2004edc8e19570d37af555644ae1655"

+            "url": "https://cdn-fastly.obsproject.com/downloads/cef_binary_6533_linux_x86_64_v3.tar.xz",

+            "sha256": "cb7225c7a937ac4cdc9c41700061f45cccc640d696902357782e57f8250bf43a"

         }

 }

​

@@ -27,11 +27,18 @@

             "baseUrl": "https://cdn-fastly.obsproject.com/downloads",

             "label": "Chromium Embedded Framework",

             "hashes": {

-                "macos-x86_64": "139c6664b6c9c446e0b56f303586fa6bd4b3587bae4742e13967c2f0f99c8740",

-                "macos-arm64": "8e833fce815b83114ab381c055122a18dc415e29af5c4db0a577caf4b817baa2",

-                "ubuntu-x86_64": "fab66dfc9cfd2e26fb87798f855aef30c2004edc8e19570d37af555644ae1655",

-                "ubuntu-aarch64": "ab09f04e534306d3f301ea997c03a6a9f7bd245042d50a434f17c1c98ac64b89",

-                "windows-x64": "87b1033ff0f8f2fb7262d8a236bc36b981cb50d24b401c20cdf9b31099a9a217"

+                "macos-x86_64": "02478ad91d284d7717ea48aad90c4ecbe90f8c6a982c48861aa149b7466505eb",

+                "macos-arm64": "6a1084a985366f3f0695b1ecd902d326a2d6f286a067935d83567d4fe94bf62b",

+                "ubuntu-x86_64": "cb7225c7a937ac4cdc9c41700061f45cccc640d696902357782e57f8250bf43a",

+                "ubuntu-aarch64": "f92df7f076bdc8cac2e3c77e27be418008b7168723201cb73fdbc2f6d91bc778",

+                "windows-x64": "922efbda1f2f8be9e5b2754d878a14d90afc81f04e94fc9101a7513e2b5cecc1"

+            },

+            "revision": {

+                "macos-x86_64": 2,

+                "macos-arm64": 2,

+                "ubuntu-x86_64": 3,

+                "ubuntu-aarch64": 3,

+                "windows-x64": 2

             }

         }

     },

​

@@ -295,7 +295,7 @@

     STRINGS

     "${FFmpeg_avutil_INCLUDE_DIR}/libavutil/ffversion.h"

     _version_string

-    REGEX "^.*FFMPEG_VERSION \t+\"n?0-9a-z\\~.-+\" \t*$"

+    REGEX "^.*FFMPEG_VERSION \t+\"n?0-9a-z\\~+.-+\" \t*$"

   )

   string(REGEX REPLACE ".*FFMPEG_VERSION \t+\"n?(0-9+\\.0-9).*\".*" "\\1" FFmpeg_VERSION "${_version_string}")

 endif()

​

@@ -41,7 +41,7 @@

  *

  * Reset to zero each major or minor version

  */

-#define LIBOBS_API_PATCH_VER 1

+#define LIBOBS_API_PATCH_VER 2

 #define MAKE_SEMANTIC_VERSION(major, minor, patch) ((major << 24) | (minor << 16) | patch)

​

@@ -228,33 +228,36 @@

     if (!capture) {

         return;

     }

+    /// It is possible that the source's serial queue is still creating this source, so perform destruction

+    /// synchronously on that queue to ensure the source is fully initialized before being destroyed.

+    dispatch_sync(capture.sessionQueue, ^{

+        OBSAVCaptureInfo *capture_info = capture.captureInfo;

-    OBSAVCaptureInfo *capture_info = capture.captureInfo;

-

-    capture stopCaptureSession;

-    capture.deviceInput.device unlockForConfiguration;

+        capture stopCaptureSession;

+        capture.deviceInput.device unlockForConfiguration;

-    if (capture_info->isFastPath) {

-        pthread_mutex_destroy(&capture_info->mutex);

-    }

+        if (capture_info->isFastPath) {

+            pthread_mutex_destroy(&capture_info->mutex);

+        }

-    if (capture_info->videoFrame) {

-        bfree(capture_info->videoFrame);

-        capture_info->videoFrame = NULL;

-    }

+        if (capture_info->videoFrame) {

+            bfree(capture_info->videoFrame);

+            capture_info->videoFrame = NULL;

+        }

-    if (capture_info->audioFrame) {

-        bfree(capture_info->audioFrame);

-        capture_info->audioFrame = NULL;

-    }

+        if (capture_info->audioFrame) {

+            bfree(capture_info->audioFrame);

+            capture_info->audioFrame = NULL;

+        }

-    if (capture_info->sampleBufferDescription) {

-        capture_info->sampleBufferDescription = NULL;

-    }

+        if (capture_info->sampleBufferDescription) {

+            capture_info->sampleBufferDescription = NULL;

+        }

-    bfree(capture_info);

+        bfree(capture_info);

-    CFBridgingRelease((__bridge CFTypeRef _Nullable)(capture));

+        CFBridgingRelease((__bridge CFTypeRef _Nullable)(capture));

+    });

 }

 #pragma mark - OBS Module API

​

@@ -1,2 +1,2 @@

-#define MIN_VFX_SDK_VERSION (0 << 24 | 7 << 16 | 2 << 8 | 0 << 0)

-#define MIN_AFX_SDK_VERSION (1 << 24 | 3 << 16 | 0 << 0)

+#define MIN_VFX_SDK_VERSION (0 << 24 | 7 << 16 | 6 << 8 | 0 << 0)

+#define MIN_AFX_SDK_VERSION (1 << 24 | 6 << 16 | 1 << 8 | 2 << 0)

​

@@ -1189,14 +1189,6 @@

    LOAD_SYM(NvCVImage_FromD3DColorSpace);

 #undef LOAD_SYM

-#define LOAD_SYM(sym) LOAD_SYM_FROM_LIB(sym, nv_cudart, "cudart64_110.dll")

-   LOAD_SYM(cudaMalloc);

-   LOAD_SYM(cudaStreamSynchronize);

-   LOAD_SYM(cudaFree);

-   LOAD_SYM(cudaMemcpy);

-   LOAD_SYM(cudaMemsetAsync);

-#undef LOAD_SYM

-

 #define LOAD_SYM(sym) LOAD_SYM_FROM_LIB2(sym, nv_videofx, "NVVideoEffects.dll")

    LOAD_SYM(NvVFX_SetStateObjectHandleArray);

    LOAD_SYM(NvVFX_AllocateState);

​

@@ -670,15 +670,6 @@

        FreeLibrary(nv_cvimage);

        nv_cvimage = NULL;

    }

-   cudaMalloc = NULL;

-   cudaStreamSynchronize = NULL;

-   cudaFree = NULL;

-   cudaMemcpy = NULL;

-   cudaMemsetAsync = NULL;

-   if (nv_cudart) {

-       FreeLibrary(nv_cudart);

-       nv_cudart = NULL;

-   }

 }

 static inline void nvvfx_get_sdk_path(char *buffer, const size_t len)

@@ -702,9 +693,8 @@

    nv_videofx = LoadLibrary(L"NVVideoEffects.dll");

    nv_cvimage = LoadLibrary(L"NVCVImage.dll");

-   nv_cudart = LoadLibrary(L"cudart64_110.dll");

    SetDllDirectoryA(NULL);

-   return !!nv_videofx && !!nv_cvimage && !!nv_cudart;

+   return !!nv_videofx && !!nv_cvimage;

 }

 static unsigned int get_lib_version(void)

​

@@ -78,10 +78,16 @@

        // Don't override existing, as this can break OSR

        std::string disableFeatures = command_line->GetSwitchValue("disable-features");

        disableFeatures += ",HardwareMediaKeyHandling";

+#ifdef _WIN32

+       disableFeatures += ",EnableWindowsGamingInputDataFetcher";

+#endif

        disableFeatures += ",WebBluetooth";

        command_line->AppendSwitchWithValue("disable-features", disableFeatures);

    } else {

        command_line->AppendSwitchWithValue("disable-features", "WebBluetooth,"

+#ifdef _WIN32

+                                   "EnableWindowsGamingInputDataFetcher,"

+#endif

                                    "HardwareMediaKeyHandling");

    }

​

@@ -83,6 +83,14 @@

    return nullptr;

 }

+void BrowserClient::OnRenderProcessTerminated(CefRefPtr<CefBrowser>, TerminationStatus, int,

+                         const CefString &error_string)

+{

+   std::string str_text = error_string;

+   blog(LOG_ERROR, "obs-browser: '%s' Webpage has crashed unexpectedly! Reason: '%s'",

+        obs_source_get_name(bs->source), str_text.c_str());

+}

+

 CefResourceRequestHandler::ReturnValue BrowserClient::OnBeforeResourceLoad(CefRefPtr<CefBrowser>, CefRefPtr<CefFrame>,

                                       CefRefPtr<CefRequest>,

                                       CefRefPtr<CefCallback>)

​

@@ -98,6 +98,8 @@

    GetResourceRequestHandler(CefRefPtr<CefBrowser> browser, CefRefPtr<CefFrame> frame,

                  CefRefPtr<CefRequest> request, bool is_navigation, bool is_download,

                  const CefString &request_initiator, bool &disable_default_handling) override;

+   virtual void OnRenderProcessTerminated(CefRefPtr<CefBrowser> browser, TerminationStatus status, int error_code,

+                          const CefString &error_string) override;

    /* CefResourceRequestHandler */

    virtual CefResourceRequestHandler::ReturnValue OnBeforeResourceLoad(CefRefPtr<CefBrowser> browser,

​

@@ -2,7 +2,7 @@

 #define OBS_BROWSER_VERSION_MAJOR 2

 #define OBS_BROWSER_VERSION_MINOR 24

-#define OBS_BROWSER_VERSION_PATCH 4

+#define OBS_BROWSER_VERSION_PATCH 5

 #ifndef MAKE_SEMANTIC_VERSION

 #define MAKE_SEMANTIC_VERSION(major, minor, patch) ((major << 24) | (minor << 16) | patch)

​

@@ -1,7 +1,5 @@

 find_package(X11 REQUIRED)

-target_compile_definitions(obs-browser PRIVATE ENABLE_BROWSER_QT_LOOP)

-

 target_link_libraries(obs-browser PRIVATE CEF::Wrapper CEF::Library X11::X11)

 set_target_properties(obs-browser PROPERTIES BUILD_RPATH "$ORIGIN/" INSTALL_RPATH "$ORIGIN/")

​

@@ -281,7 +281,7 @@

    os_mkdir(conf_path);

    CefSettings settings;

-   settings.log_severity = LOGSEVERITY_DISABLE;

+   settings.log_severity = LOGSEVERITY_FATAL;

    BPtr<char> log_path = obs_module_config_path("debug.log");

    BPtr<char> log_path_abs = os_get_abs_path_ptr(log_path);

    CefString(&settings.log_file) = log_path_abs;

@@ -367,10 +367,10 @@

 #if !defined(_WIN32)

    BackupSignalHandlers();

-   CefInitialize(args, settings, app, nullptr);

+   bool success = CefInitialize(args, settings, app, nullptr);

    RestoreSignalHandlers();

 #elif (CHROME_VERSION_BUILD > 3770)

-   CefInitialize(args, settings, app, nullptr);

+   bool success = CefInitialize(args, settings, app, nullptr);

 #else

    /* Massive (but amazing) hack to prevent chromium from modifying our

     * process tokens and permissions, which caused us problems with winrt,

@@ -379,9 +379,14 @@

     * we'll just switch back to the static library but I doubt we'll need

     * to. */

    uintptr_t zeroed_memory_lol32 = {};

-   CefInitialize(args, settings, app, zeroed_memory_lol);

+   bool success = CefInitialize(args, settings, app, zeroed_memory_lol);

 #endif

+   if (!success) {

+       blog(LOG_ERROR, "obs-browser: CEF failed to initialize. Exit code: %d", CefGetExitCode());

+       return;

+   }

+

 #if !ENABLE_LOCAL_FILE_URL_SCHEME

    /* Register http://absolute/ scheme handler for older

     * CEF builds which do not support file:// URLs */

​

@@ -216,7 +216,7 @@

 void QCefBrowserClient::OnBeforeClose(CefRefPtr<CefBrowser>)

 {

    if (widget) {

-       emit widget->CloseSafely();

+       widget->CloseSafely();

    }

 }

​

@@ -126,7 +126,8 @@

    p = obs_properties_add_int(props, "bitrate", obs_module_text("Bitrate"), 50, UINT32_MAX / 1000, 50);

    obs_property_int_set_suffix(p, " Kbps");

-   obs_properties_add_int(props, "target_quality", obs_module_text("TargetQuality"), 1, 51, 1);

+   obs_properties_add_int(props, "target_quality", obs_module_text("TargetQuality"), 1,

+                  codec == CODEC_AV1 ? 63 : 51, 1);

    p = obs_properties_add_int(props, "max_bitrate", obs_module_text("MaxBitrate"), 0, UINT32_MAX / 1000, 50);

    obs_property_int_set_suffix(p, " Kbps");

​

@@ -392,7 +392,8 @@

    dstr_catf(&log, "\theight:       %d\n", enc->cy);

    dstr_catf(&log, "\tb-frames:     %ld\n", enc->props.bf);

    dstr_catf(&log, "\tb-ref-mode:   %ld\n", enc->props.bframe_ref_mode);

-   dstr_catf(&log, "\tlookahead:    %s (%d frames)\n", lookahead ? "true" : "false", rc_lookahead);

+   dstr_catf(&log, "\tlookahead:    %s (%d frames)\n", lookahead ? "true" : "false",

+         config->rcParams.lookaheadDepth);

    dstr_catf(&log, "\taq:           %s\n", enc->props.adaptive_quantization ? "true" : "false");

    if (enc->props.split_encode) {

​

@@ -1,6 +1,6 @@

 cmake_minimum_required(VERSION 3.16...3.25)

-set(obs-websocket_VERSION 5.5.4)

+set(obs-websocket_VERSION 5.5.5)

 set(OBS_WEBSOCKET_RPC_VERSION 1)

 include(cmake/obs-websocket-api.cmake)

​

@@ -178,7 +178,7 @@

 bool Utils::Json::GetJsonFileContent(std::string fileName, json &content)

 {

-   std::ifstream f(fileName);

+   std::ifstream f(std::filesystem::u8path(fileName));

    if (!f.is_open())

        return false;

@@ -195,9 +195,11 @@

 bool Utils::Json::SetJsonFileContent(std::string fileName, const json &content, bool makeDirs)

 {

+   auto jsonFilePath = std::filesystem::u8path(fileName);

+

    if (makeDirs) {

+       auto p = jsonFilePath.parent_path();

        std::error_code ec;

-       auto p = std::filesystem::path(fileName).parent_path();

        if (!ec && !std::filesystem::exists(p, ec))

            std::filesystem::create_directories(p, ec);

        if (ec) {

@@ -207,7 +209,7 @@

        }

    }

-   std::ofstream f(fileName);

+   std::ofstream f(jsonFilePath);

    if (!f.is_open()) {

        blog(LOG_ERROR, "Utils::Json::SetJsonFileContent Failed to open file `%s` for writing", fileName.c_str());

        return false;

​

@@ -936,6 +936,12 @@

        return false;

    }

+   if (!videoConfig.cx || !videoConfig.cy_abs) {

+       blog(LOG_ERROR, "%s: Frame width or height are zero (%" PRIu32 "x%" PRIu32 ")",

+            obs_source_get_name(source), videoConfig.cx, videoConfig.cy_abs);

+       return false;

+   }

+

    DStr formatName = GetVideoFormatName(videoConfig.internalFormat);

    double fps = 0.0;

​

@@ -35,7 +35,7 @@

 #define PATH_MAX MAX_PATH

 #elif __APPLE__

 #define VERSION_PATTERN "%d.%d"

-#define FILE_PATTERN "Python.framework/Versions/Current/lib/libpython%s.dylib"

+#define FILE_PATTERN "Python.framework/Versions/%s/lib/libpython%s.dylib"

 #endif

 #define PY_MAJOR_VERSION_MAX 3

@@ -71,7 +71,7 @@

    struct dstr temp;

    dstr_init(&temp);

-   dstr_printf(&temp, FILE_PATTERN, cur_version);

+   dstr_printf(&temp, FILE_PATTERN, cur_version, cur_version);

    int minor_version = PY_MINOR_VERSION_MAX;

    do {

​

@@ -1607,7 +1607,8 @@

    if (python_path && *python_path) {

 #ifdef __APPLE__

        char tempPATH_MAX;

-       snprintf(temp, sizeof(temp), "%s/Python.framework/Versions/Current", python_path);

+       snprintf(temp, sizeof(temp), "%s/Python.framework/Versions/%i.%i", python_path, python_version.major,

+            python_version.minor);

        os_utf8_to_wcs(temp, 0, home_path, PATH_MAX);

        Py_SetPythonHome(home_path);

 #else

​