Commit Graph

11651 Commits (master)

Author SHA1 Message Date
Jim 9e15114750
Merge pull request #6577 from chippydip/multiple-video-mixes
libobs: Add support for multiple video mixes
2022-08-09 21:37:48 -07:00
jpark37 fb146fa370 libobs: Remove display GPU markers without draws 2022-08-09 20:21:27 -07:00
jpark37 a392aa52cc obs-filters: Support HDR AI greenscreen 2022-08-09 20:21:05 -07:00
PatTheMav ef2b0a0f52 cmake: Update pluginhelpers script from obs-plugintemplate 2022-08-10 02:05:27 +02:00
PatTheMav f31c1c124b cmake: Update Xcode project generation on macOS
* If a valid team id is provided, automatic code sign management is
  enabled
* Different deployment targets for x86_64 and arm64 are enabled for
  Xcode-based builds
* Codesign identity and code-sign style are set globally
2022-08-10 02:05:27 +02:00
PatTheMav 8e3f19722e cmake: Fix unwanted public header installation on macOS 2022-08-10 02:05:27 +02:00
PatTheMav c6ea39534f cmake: Remove workarounds for legacy obs-browser submodule 2022-08-10 02:05:27 +02:00
PatTheMav 2006092076 cmake: Fix missing header installation for libobs and obs-frontend-api 2022-08-10 02:05:27 +02:00
Vainock 020cd92ab5 mac-videotoolbox: Fix typo 'diffent' 2022-08-09 20:05:06 -04:00
PatTheMav 43a49dca47 cmake: Fix CMake package export templates for CMake 3.24
CMake 3.24 implemented changes that break dependency discovery of the
exported libraries built by OBS.
2022-08-09 19:48:03 -04:00
Kurt Kartaltepe 7f3ea4e00c libobs-opengl: Check window creation for errors
Without this we get somewhat misleading errors from later in the
swapchain creation when this fails. This is currently happening for
users attempting to use multi-gpu with prime offloading on nvidia.
2022-08-09 13:55:45 -03:00
gxalpha ad57af4c0a mac-videotoolbox: Reject color formats other than NV12 and I420 2022-08-09 16:19:30 +02:00
gxalpha 6644fed7b1 mac-capture: Fix macOS 12 SCK Display Capture workaround
Adding all windows manually means that any windows opened after the
session was started won't appear. This instead excludes the Control
Center from Display Capture. While unfortunate, it seems to be the only
thing on the display that can't be disabled.
2022-08-09 16:18:28 +02:00
Matt Gajownik 3a7a6f4dc0 UI: Fix build error with stray defaultStylesheet 2022-08-09 22:57:23 +10:00
Matt Gajownik aacc1133f7 UI/installer: Require Windows 10 64bit minimum 2022-08-09 22:43:09 +10:00
Matt Gajownik a7503254f3 Revert "UI: Apply default stylesheet before applying theme"
This reverts commit 08cee21158.

Turns out that while this did improve theme switching performance, it
also completely breaks styling on macOS and introduces visual quirks
on Windows after switching themes, such as sliders and dropdown contents.

# Conflicts:
#	UI/obs-app.cpp
#	UI/obs-app.hpp
2022-08-09 22:39:26 +10:00
Richard Stanway 3c6c44e1fe
win-capture: Fix incorrect path in CMakeLists 2022-08-09 02:31:50 +02:00
PatTheMav 3c3fdc7a70 cmake: Fix M1-based OBS.app appearing as being an "iOS" app
MacOS' system information checks the CFBundleSupportedPlatforms value
in the app's property list file for the type. This was correctly set
for plugin bundles, but not binary bundles so far.
2022-08-08 18:54:29 -04:00
PatTheMav 61f862d826 cmake: Fix broken pthread detection on Windows with CMake 3.24
Workaround for CMake issue
https://gitlab.kitware.com/cmake/cmake/-/issues/23829
2022-08-08 15:50:42 -07:00
jpark37 9c77796299 obs-filters: Fix NVIDIA greenscreen issues
Fix non-async sources, make sure math is linear-correct, preserve
incoming alpha, and allow the filter to work in previews.
2022-08-08 15:50:06 -07:00
tytan652 1272209710 obs-scripting: Fix SWIG flags for non-macOS POSIX 2022-08-08 15:00:09 +02:00
cg2121 185dbf5492 UI: Fix ffmpeg path browse button not showing
The ffmpeg path browse button would be hidden in the settings.
2022-08-08 20:44:46 +10:00
derrod 9c20ad9046 obs-ffmpeg: Set NVENC CQP maximum to 51
51 is the actual maximum and especially with HEVC values higher than 30
are actually pretty usable.
2022-08-08 09:24:08 +02:00
Richard Stanway 86963f65d2
libobs, win-capture: Don't export ms_get_obfuscated_func
Since this was included in things like the inject helper and game
capture DLLs, it added an additional export to those programs. Instead,
simply share the source files directly in the projects that need it.

Co-authored-by: jpark37 <jpark37@users.noreply.github.com>
2022-08-07 19:41:23 +02:00
Matt Gajownik 61e0d69779 obs-browser: Update version to 2.18.5
71ef41a - Null check macOS window handle before detaching view
6235dfd - cmake: Remove setting code sign identity for Xcode builds
2022-08-07 15:14:50 +10:00
PatTheMav 8db359d060 cmake: Fix plugin RPATH entry on Linux 2022-08-07 04:06:54 +02:00
Norihiro Kamae c42047cb68 libobs: Fix missing pair of GS_DEBUG_MARKER
The conditional branch added by 4fe6803fe resulted GS_DEBUG_MARKER_END
is not called when the branch condition is failed.
2022-08-06 17:24:56 -07:00
pkv e08632328d obs-filters: Reset RTX greenscreen on cuda error
This resets the RTX greenscreen filter if the FX returns a CUDA error.
In case of a CUDA error 1099, the error can keep repeating locking up
the filter which is inoperant. So if such an error is detected we reset
the FX.

Signed-off-by: pkv <pkv@obsproject.com>
2022-08-06 17:22:03 -07:00
Jim cb051240ff
Merge pull request #6896 from GeorgesStavracas/gbsneto/iconography
Iconography and list styles
2022-08-06 17:12:42 -07:00
Chris f5fe4d0acf obs-ffmpeg: Fix USAGE typo
Replace TRANSCONDING with TRANSCODING, because it is likely that the
typo compatibility will be removed in a future AMF header update. This
should also minimize confusion and improve search.
2022-08-06 20:02:48 -04:00
shiina424 29574b7fd2 win-wasapi: Add missing locale text 2022-08-06 16:58:16 -07:00
Ryan Foster f344c9106b flatpak: Use FFmpeg GitHub mirror
The ffmpeg.org domain has had periods of instability recently. If GitHub
is down, our entire CI is down, so let's use the FFmpeg GitHub mirror.
2022-08-06 19:52:34 -04:00
cg2121 b61cc5de23 UI: Fix spacing with media controls
The spacing in the media controls was set to 0. This only became
noticeable when using the Yami theme, as the buttons have a background
color.
2022-08-06 16:46:47 -07:00
tududweb 9780d2f596 obs-ffmpeg: Remove unused variables for NVENC 2022-08-06 16:45:31 -07:00
tududweb e16f336882 obs-ffmpeg: Reinit before retrying init for NVENC 2022-08-06 16:45:31 -07:00
tududweb 6c364f78cf obs-ffmpeg: Correctly assign argument for NVENC
When retrying again without Psycho Visual Tuning,
the argument psycho_aq should be false.
2022-08-06 16:45:31 -07:00
cg2121 f1f405b170 UI: Fix buttons in settings dialog
- The buttons in the accessibility settings were a fixed height, so
they would be rendered in a undesirable way with the Yami theme.

- Also fixes clear button sizing issues in hotkeys sections
2022-08-06 16:26:26 -07:00
tytan652 d71878cd35 obs-ffmpeg: Add better error if SRT or RIST libraries are not found 2022-08-06 16:18:55 -07:00
jpark37 4fe6803fe4 libobs: Prevent D3D11 projectors from tearing
Some users stream projectors, so don't let them tear. Use the waitable
object to check the flip queue, and only flip if there's space.

Metal and Vulkan can probably perform similar flip throttling once OBS
starts using them.
2022-08-06 16:16:20 -07:00
cg2121 2b4629848d UI: Fix spacer lines not using accessibility color
The spacer helper lines would not use the selection color set in the
accessibility settings.
2022-08-06 16:14:24 -07:00
Monsteer 0c930f52d3
UI: Fix typo "QTestEdit" in Yami
Changed "QTestEdit" with "QTextEdit".
2022-08-07 01:13:56 +02:00
gxalpha 3233c455d1 UI: Make spacing helpers DPI aware
Addition to 76ae9cbc which was made independently of the spacing helpers
introduced in 2d6a9c9c
2022-08-06 16:10:20 -07:00
Timo Gurr a46cc43e6f test: Only build osx tests for OS_MACOS
Fixes CMake build error on Linux:

CMake Error: The following variables are used in this project, but they are set to NOTFOUND.
Please set them or make sure they are set and tested correctly in the CMake files:
COCOA (ADVANCED)
    linked by target "macOS_test" in directory /var/tmp/paludis/build/media-video-obs-studio-28.0.0-beta1/work/obs-studio-28.0.0-beta1/test/osx
2022-08-06 16:07:17 -07:00
Norihiro Kamae e7c00890f6 UI: Increase maximum limit of automatic file splitting 2022-08-06 16:06:17 -07:00
Ed Maste 39269a7ae9 cmake: fix default version if `git describe` fails
If the `git describe` command fails we want to fall back to a default
version.  _OBS_DEFAULT_VERSION is not in the same format as the string
returned by `git describe` though.  In the event that the command fails
just use _OBS_DEFAULT_VERSION directly rather than trying to parse it.

Fixes: cmake fails if git is not installed but .git/ exists #6940
2022-08-07 00:51:01 +02:00
columbarius 76e9c64f41 Revert "linux-capture: Fix Ubuntu 21.10 builds"
This reverts commit 0532a5c1f0.

Ubuntu 21.10 is from OBS 28 onwards not longer supported and as such we
can raise the requirement of the PipeWire dependency to 0.3.33.
2022-08-06 09:28:58 -03:00
gxalpha a1e8075fba UI: Unregister file splitting hotkey when clearing hotkeys 2022-08-06 10:25:10 +10:00
Vainock e6a03be487 obs-ffmpeg, obs-transitions: Use property suffixes 2022-08-06 10:23:26 +10:00
gxalpha 405f5123c1 UI: Don't hardcode margins in lineedit-autoresize 2022-08-06 10:22:25 +10:00
gxalpha 9f370bd36e mac-capture: Show "hidden" checkbox for app capture on update as well 2022-08-04 00:44:29 +02:00