Commit Graph
14713 Commits
Author SHA1 Message Date
tytan652 c7e70fd6a3 CI: Use Flatpak action upstream
The fork has been merge with upstream.

https://github.com/flathub-infra/flatpak-github-actions/issues/17
(cherry picked from commit a368f05d01)
2025-06-27 16:37:10 -04:00
Ryan Foster 06f723f4d1 build-aux: Use GitHub repo for LuaJIT
Curl reports that the luajit.org git repo is using a self-signed cert.
This is causing git operations to fail. Let's just use the GitHub
mirror.

Cherry Pick Note:
Manually edited to only change the remote and not the commit.

(cherry picked from commit cfb23a51ff)
2025-06-27 16:37:10 -04:00
Tarulia 086acd6ebd deps/json11: Fix compile error on GCC 15+
(cherry picked from commit 6931d80e16)
2025-06-27 16:37:10 -04:00
Ryan Foster e9c0d49340 CI: Update flatpak-builder and flat-manager actions
actions/cache versions other than v4, v3, v4.2.0, and v3.4.0 were
deprecated and gradually sunset through February.

@actions/cache versions other than v4.0.0+ were deprecated and gradually
sunset through February.

See:
 * https://github.com/actions/cache/discussions/1510
 * https://github.com/actions/toolkit/discussions/1890

flathub-infra/flatpak-github-actions/flatpak-builder set its
@actions/cache dependency version to "^3.2.3" and was last updated on
July 29, 2024. As a result, its yarn.lock file specifies version
"3.2.4", which is no longer supported and does not work.

Update flathub-infra/flatpak-github-actions actions now that they have
updated their @actions/cache dependency.

(cherry picked from commit 8db61f2fab)
2025-06-27 16:37:10 -04:00
Norihiro Kamae f93294eb40 libobs/util: Fix tv_nsec becoming 1000000000 in os_event_timedwait
(cherry picked from commit 099bc26bd6)
2025-06-27 16:37:10 -04:00
jcm d26a3fdcd9 cmake: Adjust macOS SDK detection
Cherry picked from 8f1bcc17
2025-04-25 18:35:12 -04:00
Ryan Foster fcd1910bf5 libobs: Update version to 31.0.3
(cherry picked from commit 3e84469cc1)
31.0.3
2025-03-26 16:22:17 -04:00
Exeldro 8f2e6cb3b5 libobs: Fix duplicating scene with custom size
(cherry picked from commit 5ca6e1effa)
2025-03-26 16:22:17 -04:00
Ryan Foster 9d07e5c9e8 obs-websocket: Update version to 5.5.6
Fix a possible crash when opening OBS in Studio Mode.

(cherry picked from commit b96607345a)
2025-03-25 18:01:07 -04:00
PatTheMavandRyan Foster 9b88bb2cb5 UI: Only emit frontend events for existing scene collection
To emit frontend events early during OBS' initialization, the
disableSaving state variable needs to be "falsy" (as events will not be
emitted otherwise).

The code path taken for generating a new fallback scene collection
has disableSaving decremented to "enable" saving (and thus frontend
events) already, so it's just the code paths for existing collections
that need this workaround.

Emitting the scene changed and preview scene changed events when a
fallback scene collection has been created has side-effects when
OBS Studio is set to studio mode and can lead to potential crashes,
as the studio mode is still in an invalid state at this point.

Co-authored-by: Ryan Foster <ryan@obsproject.com>
2025-03-25 18:01:07 -04:00
Lukáš Jech bf0d9773b3 rtmp-services: Add "VRCDN - Live" service
(cherry picked from commit 01d5198f7b)
2025-03-25 18:01:07 -04:00
duyquach-castr d20d2863ff rtmp-services: Update Castr.io ingests
(cherry picked from commit 291adefb4d)
2025-03-25 18:01:07 -04:00
Service Checker e9c87a8d7c rtmp-services: Remove defunct servers/services
(cherry picked from commit 1673cce921)
2025-03-25 18:01:07 -04:00
jcm 96b9166815 mac-avcapture: Clear memory when creating frame struct
(cherry picked from commit 68c4617927)
2025-03-25 18:01:07 -04:00
Ryan Foster 4fe86d626a obs-browser: Update version to 2.24.6
46adc4b - Check source validity before attempting to log renderer crash
ac34d8e - Don't loop Cef exit while shutting down if task post fails
b56fd78 - Update version to 2.24.6

(cherry picked from commit 95cea5487b)
2025-03-25 18:01:07 -04:00
pkv 3bebf2d67f nv-filters: Silence initial load error for Blur
On initial run of the Blur filter, some parameters are not all set when
there is the first call to load the effect. This is actually not an
issue, so the log is now silenced at this time.

Signed-off-by: pkv <pkv@obsproject.com>
(cherry picked from commit f6f5c7bb25)
2025-03-25 18:01:07 -04:00
pkv 856c914fd6 nv-filters: Remove reset signal for Video effects
The reset signal was triggered whenever there was an update in the
parent source. This destroys the effect and recreates it, which can be
resource heavy.
We now let the SDK handle the source update on its own rather than
manually resetting the effect on obs side.

Signed-off-by: pkv <pkv@obsproject.com>
(cherry picked from commit cc452e5acd)
2025-03-25 18:01:07 -04:00
pkv 347d67d3c6 nv-filters: Fix CudaStream used in Video effects
During the mapping and unmapping of resources, the CudaStream was not
always consistent.
This fixes the issue.
Thanks to Stephan from NVIDIA Dev support for noticing the mismatch.

Signed-off-by: pkv <pkv@obsproject.com>
(cherry picked from commit 3402f6c7d0)
2025-03-25 18:01:07 -04:00
pkv 81d21a1f1b nv-filters: Reallocate state when resetting AIGS filters
This properly allocates the temporal state variable used in AI
greenscreen effect, when the latter is reset.

Signed-off-by: pkv <pkv@obsproject.com>
(cherry picked from commit b5d0054cfa)
2025-03-25 18:01:07 -04:00
pkv 83c245d786 nv-filters: Fix destruction of Background Blur effect
For the background blur effect, it was found that destroying it and
then adding any other NVIDIA effect led to a blank picture.
This commit swaps the order of destroying the effect and the associated
cudaStream.
For other effects the order does not matter; I have no idea why the
order matters for blur effect and the SDK gives no indication about any
proper order at destruction time.

Fixes bug #11383.
Signed-off-by: pkv <pkv@obsproject.com>
(cherry picked from commit 2682ccc33c)
2025-03-25 18:01:07 -04:00
pkv 255801816a nv-filters: Set max effective threshold to 0.95 for Background removal
The threshold THR in Background removal filter has the following effect:
- if alpha if between [THR - 0.1; THR], alpha is interpolated;
- if alpha >= THR, alpha is set to 1.0;
- if alpha <= THR - 0.1, alpha is set to 0.
It was introduced in order to smooth the alpha at the edges of the
foreground.
This works fine unless THR == 1, where there can be bulk pixels with
alpha which will be interpolated as if they were at the edge;
in order to ensure that a bulk area with alpha set to 1.0 is well
defined, the max threshold is now set to 0.95 (so if the user picks a
unity threshold, a value of 0.95 will actually be used).
This fixes a bug in third party plugins which rely on a bulk foreground
safely set at alpha == 1.0. [1]

[1] https://github.com/FiniteSingularity/obs-stroke-glow-shadow/issues/61

Signed-off-by: pkv <pkv@obsproject.com>
(cherry picked from commit ff51280ecb)
2025-03-25 18:01:07 -04:00
Bo 7cb45aa3f1 obs-nvenc: Fix incorrect CUDA array size allocation
Fix cuda array use 2 bytes per element instead of 4 bytes with P010 format.

(cherry picked from commit ecb99e3b34)
2025-03-25 18:01:07 -04:00
Dennis Sädtler aa0360c00f libobs: Reset reconnecting state when can_reconnect is false
(cherry picked from commit 12baa1c817)
2025-03-25 18:01:07 -04:00
Dennis Sädtler 66390c9a72 Revert "libobs: Do not allow reconnect if stop code is OBS_OUTPUT_INVALID_STREAM"
This reverts commit a0edc5e8bc.

(cherry picked from commit 2950daa29d)
2025-03-25 18:01:07 -04:00
Ryan Foster f22e2b704b CI: Use rebuilt CEF to avoid memory allocation crashes on macOS
Use a rebuilt CEF of the same version (6533) that disables
use_partition_alloc_as_malloc and enable_backup_ref_ptr_support to avoid
memory-related crashes on macOS.

(cherry picked from commit 2964d54eef)
2025-03-25 18:01:07 -04:00
prgmitchell 7e7c8f4abd win-capture: Add FragPunk to compatibility list
(cherry picked from commit b64f549ec9)
2025-03-25 18:01:07 -04:00
Ryan Foster 80d0dd987d rtmp-services: Remove unresponsive servers
These servers are unresponsive and are causing our nightly service
checks to fail. We do not know if these servers are intentionally
unreachable, but I do not want our nightly CI runs to keep failing, so I
am removing them unless we are informed they are working.

(cherry picked from commit 6f115df3af)
2025-03-25 18:01:07 -04:00
Ryan Foster e6137e15e0 libobs: Update version to 31.0.2
(cherry picked from commit ef2fe6fdd3)
31.0.2
2025-03-07 16:45:32 -05:00
jcm 2b6bacd6f5 mac-avcapture: Prevent race condition in source init/deinit
(cherry picked from commit 4fd671ee89)
2025-03-07 15:56:35 -05:00
Ryan Foster c4c2b77741 win-dshow: Fix possible crash if frame width or height is zero
If a frame has a width or height of zero, this value will make it into
libobs/media-io/video-frame.c:video_frame_init and cause linesizes or
heights to be zero, which will result in a bmalloc(0) call and OBS will
crash.

Instead of letting the call stack get that far, check the frame width
and height here at the source, log an error, and return early if the
frame width or height are zero.

(cherry picked from commit 3437e2b082)
2025-03-07 15:56:35 -05:00
Ryan Foster 2deb61b68a obs-browser: Update version to 2.24.5
082a0a2 - Don't emit a normal call to a function for closing panels
663dc38 - Disable modern game controller API on Windows
4023fad - Log fatal CEF crashes to file
52c1527 - Print browser source renderer crashes to OBS log
af0651b - Log error if CefInitialize fails
8223215 - Revert "Enable Qt message loop on Linux"
16ff0fa - Update version to 2.24.5

Additionally, update buildspec.json and build-aux/modules/99-cef.json to
use the new CEF builds. This is being done because the changes in
obs-browser specifically are meant to work with a CEF build compiled
with use_gtk=false.

(cherry picked from commit 3d9d066d07)
2025-03-07 15:56:35 -05:00
Ryan Foster d8e2431e30 obs-websocket: Update version to 5.5.5
(cherry picked from commit 50429bd2b0)
2025-03-07 15:56:35 -05:00
DeeDeeG f134ea6bff obs-nvenc: Fix lookahead depth value logging
This was logging an intermediate value, rather than the final lookahead
depth value after all calculations. Log the final value instead.

(cherry picked from commit a8a349c805)
2025-03-07 15:56:35 -05:00
Bleuzen b1c06c7256 obs-nvenc: Correct max target quality for AV1
(cherry picked from commit 05c2f56853)
2025-03-07 15:56:35 -05:00
Yann Salmon 569d0132ab cmake: Fix regexp to detect installed FFmpeg version
The regexp was not tolerating a + sign is the version string,
causing configuration to fail on Ubuntu 24.04 when the installed
version is 6.1.1-3ubuntu5+esm2.

(cherry picked from commit 9b97d48573)
2025-03-07 15:56:35 -05:00
pkv 7447d7a7ca nv-filters: Remove CUDA RT functions
We don't use CUDA RT functions anymore.
So this commit removes their loading from the CUDA RT DLL.
This also fixes a crash when loading different versions of CUDA RT when
the SDK is updated [1].

[1] https://github.com/obsproject/obs-studio/issues/11813

Signed-off-by: pkv <pkv@obsproject.com>
(cherry picked from commit d1249cd993)
2025-03-07 15:56:35 -05:00
pkv 146056d7a6 nv-filters: Update SDK version targeted
This updates checks against current SDK redist versions:
- 0.7.6 (Video Effects)
- 1.6.1.2 (Audio Effects)

Users will receive a warning if their redist versions are lower than
these.

Signed-off-by: pkv <pkv@obsproject.com>
(cherry picked from commit 417eddfc9d)
2025-03-07 15:56:35 -05:00
jcm 40e2bc5112 obs-scripting: Fix macOS Homebrew Python loading
(cherry picked from commit 83934acb44)
2025-03-07 15:56:35 -05:00
Translation Updater b7b7c4cbbc Update translations from Crowdin 31.0.1 2025-01-18 00:10:25 +00:00
Ryan Foster decdf44c9e libobs: Update version to 31.0.1
(cherry picked from commit 0014f9fa18)
2025-01-17 18:42:06 -05:00
Ryan FosterandPatTheMav 07be61a2e3 UI: Use filename stem as fallback value on empty collection name
If - for some reason - the name in a scene collection is empty (or
the key doesn't even exist), use the filename stem as a fallback name.

This ensures that the scene collection entry in the cache has a valid
non-empty name.

Using an std::string allows the use of its "empty" method to check for
this otherwise invalid state of the collection data.

Ported from 1baa4619e4.

Co-authored-by: PatTheMav <PatTheMav@users.noreply.github.com>
2025-01-17 17:45:22 -05:00
Ryan FosterandPatTheMav e21712af3e UI: Prevent creation of scene collections with empty name
Empty names for scene collections are not allowed, but this constraint
is only enforced by UI code during text input.

Thus frontend API users are able to create valid scene collections with
empty names which will lead to later possible crashes as the scene
collection is malformed.

As the frontend API uses the related function CreateNewSceneCollection
which handles exceptions by this method, no crashes should occur when
an empty string is provided by an API caller.

Ported from 552c19cab2.

Co-authored-by: PatTheMav <PatTheMav@users.noreply.github.com>
2025-01-17 17:42:29 -05:00
Kurt Kartaltepe 85000b441d libobs: Fix underlinking by adding libx11
We directly depend on libx11 for various operations in obs-nix-x11.c,
not just xcb. So be sure to link it in too.

fixes #11667

(cherry picked from commit 22f222600a)
2025-01-17 17:33:55 -05:00
derrod b8c563cba7 image-source: Fix slideshow stopping on last file in random mode
(cherry picked from commit 41a38f742c)
2025-01-17 17:33:55 -05:00
derrod c1c76a472f obs-nvenc: Abort encoder init if custom options are invalid
(cherry picked from commit 223015bd54)
2025-01-17 17:33:55 -05:00
derrod 483c66c65e obs-nvenc: Fix translation string for 4:4:4 unsupported error
(cherry picked from commit 7a04980213)
2025-01-17 17:33:55 -05:00
gxalpha 0db19736a4 cmake: Turn off camera reaction by default on macOS 14.4 and later
The reaction effects that macOS adds by default are confusing to users
as they're turned on by default and users don't know where they come
from or where to turn them off. Setting this flag in the apps Info.plist
prevents them from being turned on by default. The macOS UI makes it
very obvious to the user where they can turn them on should they wish to
do so.

(cherry picked from commit 79f5ba0e1d)
2025-01-17 14:11:50 -05:00
izwb003 b467ab7b71 libobs: Fix deadlock on macOS input method change
(cherry picked from commit 48dad45ed5)
2025-01-08 15:33:26 -05:00
tytan652 8c2c1ba29f libobs-opengl: Avoid trying to allocate 0 byte on Linux
(cherry picked from commit a0e4e37341)
2025-01-08 15:33:26 -05:00
Penwywern 61a5a92582 UI: Fix linux base folder location 2025-01-08 15:25:15 -05:00