0
0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 21:13:04 +02:00
Commit Graph

11317 Commits

Author SHA1 Message Date
Clayton Groeneveld
2d6a9c9cc1 UI: Show spacing helpers in preview
This shows distance between sides of preview and edges of sources.
This will allow users to more easily align sources.

Co-authored-by: Palakis <contact@slepin.fr>
2022-07-30 19:41:18 -07:00
gxalpha
728d919bde mac-capture: Make background transparent in SCK App Capture on macOS 13+ 2022-07-31 11:22:48 +10:00
Matt Gajownik
92824b5e2e enc-amf: Add 2.5 second timeout for AMF test process 2022-07-31 10:56:11 +10:00
tytan652
1e1a21b7bf obs-websocket: Update submodule
- base: Add checks for submodules in CMake
- base: Add ENABLE_WEBSOCKET CMake option
- base: Clean up find_qt macro
2022-07-30 17:34:36 -07:00
tytan652
4ce3a729fd plugins: Make CMake fail if obs-websocket is not found 2022-07-30 17:34:36 -07:00
jpark37
2455753948 win-dshow: Compute HDR colorspace
Figure out colorspace from TRC and primaries if necessary.
2022-07-30 17:25:37 -07:00
jpark37
d8551e444b media-playback: Compute HDR colorspace
Figure out colorspace from TRC and primaries if necessary. AMF in
particular doesn't seem to provide full metadata.
2022-07-30 17:25:37 -07:00
Ryan Foster
59e91c7c58 CI: Fix Linux package filename version
In .github/workflows/main.yml, for the linux_build job, the variable
BUILD_FOR_DISTRIBUTION is set to the string "true" or "false" on CI.
Later, in CI/linux/03_package_obs.sh, we perform a boolean check on
this variable. However, "false" will evaluate as true, because it is a
non-null string. This was causing CI Linux packages to always build as
if BUILD_FOR_DISTRIBUTION was enabled, which caused the git commit hash
to be omitted from package filenames.

Since we know the expected values, let's just test directly if the
variable equals "true" to get the expected behavior.
2022-07-31 10:24:36 +10:00
pkv
a9a65a88d8 obs-filters: Reset RTX Greenscreen if parent is updated
This fixes a bug where an update of the parent source breaks the filter.
A signal handler is added to listen to updates of the parent.
This triggers a reset of the RTX FX.

Signed-off-by: pkv <pkv@obsproject.com>
2022-07-30 17:06:51 -07:00
tytan652
5490e4f44c libobs,docs: Improve failed module loading logging
- Avoid putting libs (like CEF) in the plugins load failure message.
- Consider obsolete macOS obs-browser plugin fail as a hardcoded skip.
2022-07-30 16:55:03 -07:00
CarrotCodes
ba1b5fcaea CI: Fix Sparkle cache location for local macOS CI build 2022-07-31 09:48:57 +10:00
Matt Gajownik
577b11ede4 CI: Bump CEF from 4638 (95) to 5060 (103) 2022-07-31 09:46:44 +10:00
Paul Hindt
7095f0dd70 aja: Only allow output formats matching OBS framerate 2022-07-30 16:39:20 -07:00
jpark37
eb7bb07a79 UI: JXR screenshots on Windows
Use JXR for HDR video on Windows. Other operating systems will tonemap
HDR to SDR, and save to PNG. Continue to take PNG screenshots for SDR.
We will probably support EXR for Mac/Linux someday.
2022-07-30 16:33:57 -07:00
jpark37
c03dfd6dbc obs-filters: Add HDR support to Crop/Pad 2022-07-30 16:22:52 -07:00
jpark37
9fc797c745 obs-filters: Align scale filter to pattern
No functionality change.
2022-07-30 16:22:52 -07:00
jpark37
a65477bf06 obs-filters: Add HDR bypass for sharpen
Not sure how to implement controls for HDR, so skip unless SDR for now.
2022-07-30 16:22:37 -07:00
jpark37
ee2753961e obs-filters: Add HDR support to Render Delay 2022-07-30 16:22:23 -07:00
tytan652
91c46af767 UI: Fix close display before native surfaces
A QPlatformSurfaceEvent constant is used in a switch that only accept
QEvent type.

timerEvent() is missing the override keyword.

f8d415afbe
2022-07-30 16:21:36 -07:00
jpark37
2e6dcc7f17 obs-transitions: Simplify fade shaders 2022-07-30 16:19:08 -07:00
cg2121
5bdd4fe658 UI: Fix studio mode label not updating
When studio mode is enabled and OBS is first started, the program
scene label would be empty.
2022-07-31 09:18:14 +10:00
Norihiro Kamae
8af6b79044 CI: Use xcrun notarytool instead of xcnotary
xcnotary was discontinued since Apple now provides `xcrun notarytool`.
This commit used `xcrun notarytool` to notarize the package.
2022-07-30 19:52:36 +02:00
PatTheMav
c9859e5afc cmake: Add informal output of Qt version selected for current build 2022-07-30 18:04:15 +02:00
PatTheMav
48091adc04 CI: Add Invoke-External functions for Powershell
Forward-port from obs-plugintemplate to restore cmake output during
the configuration step.
2022-07-30 18:04:15 +02:00
Ryan Foster
23fcc02747
Merge pull request #6134 from pkviet/nativesrtrist
obs-ffmpeg: Support native SRT & RIST output
2022-07-30 11:27:22 -04:00
pkv
21621e5f5e
CI: Disable new mpegts output for linux
Support of the new mpegts output would require manual compilation of
librist & libsrt libs.
CI on ubuntu hasn't been updated so disable the new mpegts output for
now.

Signed-off-by: pkv <pkv@obsproject.com>
2022-07-30 17:03:20 +02:00
pkv
039d7347a3
obs-ffmpeg: Allow use of old mpegts output
By default, new mpegts output is used; but to allow CI on linux not
to be broken, we allow use of old mpegts output.
Up to ubuntu 22.04 there is no librist package available.
A manual compile is then required but the CI scripts would need to be
updated.
This also allows easy fallback in case of fatal bugs in new output.

Signed-off-by: pkv <pkv@obsproject.com>
2022-07-30 17:03:20 +02:00
pkv
e7d097cab8
obs-ffmpeg: Native SRT/RIST for mpegts output
Currently the ffmpeg_mpegts_muxer output is integrated with ffmpeg-mux.
Both use obs native encoders in contrast with obs-ffmpeg-output which
relies on avcodec library.
This allowed easy implementation of SRT, RIST & HLS protocols through
avformat library.
The main drawback is that obs-ffmpeg-mux exe doesn't allow for easy
debugging nor logging of the protocols.
It was written initially as a separate binary designed for recording so
that if obs fails for some reason, the recording can still terminate
gracefully.

In this commit the ffmpeg_mpegts_muxer is rewritten so that a pipe to
the ffmpeg-mux binary is not used any more.
The muxing to mpegts is still delegated to avformat.
But it can be traced more easily in all its steps.
Also the protocol part for SRT & RIST is implemented natively.
Custom avio_contexts for SRT & RIST are used to that end.
This allows to pass our own implementation of librist and libsrt
libraries instead of relying on avformat. This is very advantageous :
- this allows better logging.
- this allows better bug fixing and maintainance without having to rely
on hypothetical upstream fixes.

One immediate bonus of native implementation is that fixes bugs which
were not previously fixable.

Fixes: SRT & RIST auto-reconnect partly broken  #6749
Fixes: SRT: OBS unusable and uncloseable after starting stream to
invalid srt server #5791

Signed-off-by: pkv <pkv@obsproject.com>
2022-07-30 17:03:10 +02:00
gxalpha
5f40084d25 mac-capture: Don't exclude desktop windows in SCK display capture
This fixes the desktop wallpaper missing on Display Capture on macOS 12
2022-07-30 15:24:35 +02:00
gxalpha
0207531910 mac-capture: Inline content_changed function 2022-07-30 15:24:35 +02:00
gxalpha
ea9350bcbf UI: Add hotkey to split file
Adds a frontend hotkey that splits the current recording file. Ideally,
this would only appear if file splitting is enabled like the replay
buffer hotkey, however that is an output hotkey which is hidden because
the output doesn't exist. This doesn't work here since the recording
output is obviously always available, but is unaware of whether file
splitting is enabled until the output is started.
2022-07-30 15:21:08 +02:00
gxalpha
0c8befd4b3 UI: Add file splitting option "Only split manually" 2022-07-30 15:21:08 +02:00
gxalpha
8fd2f164b7 obs-ffmpeg: Enable file splitting with obs_data directly
Also modifies UI accordingly.

This can enable file splitting even if no time or storage limit is set.
2022-07-30 15:21:08 +02:00
Be1erafon
6c39293bc8 rtmp-services: Add Streamvi service 2022-07-30 12:41:58 +02:00
gxalpha
467f73d4c9 obs-frontend-api: Add function for manual file splitting 2022-07-30 18:50:13 +10:00
gxalpha
ae3c9b3628 obs-ffmpeg: Add proc handler for manual file splitting 2022-07-30 18:50:13 +10:00
Matt Gajownik
cb8bc3413a UI: Add support for theme meta, parent theme palette
Theme Meta allows individual themes to provide additional information to
OBS.

The primarily goal is for a theme to define a "parent", allowing to
extend existing themes with additional attributes.
2022-07-30 18:48:19 +10:00
tududweb
bf65c5b041 image-source: Correctly assign hotkey to next instead of prev 2022-07-30 17:14:50 +10:00
gxalpha
64abfca620 UI/themes: Add image to QGroupBox checkbox on Yami 2022-07-30 17:13:52 +10:00
jpark37
5ae7a92101 obs-ffmpeg: Set MaxCLL/MaxFALL for AMF 2022-07-29 23:23:25 -07:00
jpark37
00828d1d06 win-capture: Bump graphics hook version to 1.8.0 2022-07-29 23:22:39 -07:00
jpark37
f55021be90 graphics-hook: Bump Vulkan version
Vulkan loader blocks implicit layers older than application apiVersion.
2022-07-29 23:22:39 -07:00
jpark37
8a4352c1e5 graphics-hook: Relax Vulkan allocation strategy
Stop requiring DEVICE_LOCAL. May be needed for integrated GPUs.
2022-07-29 23:22:39 -07:00
jpark37
b7d630af6b graphics-hook: Update VkResult strings 2022-07-29 23:22:39 -07:00
jpark37
4c7c1854bd graphics-hook: Track DXGI status with counter
Previous approach could mark Present exit too early.
2022-07-29 21:54:28 -07:00
Eric Laberge
dfb9bb74f7 graphics-hook: Avoid conflict between Vulkan and DXGI Present 2022-07-29 21:54:07 -07:00
Ryan Foster
7bfc7e65f4 CI: Update deps to obs-deps 2022-07-29 release
Notable changes:
 * Use VS2022
 * Update zlib to 1.2.12
 * Update opus to ab04fbb1b7
 * Update libvpx to 1.12.0
 * Update SVT-AV1 to 1.1.0
 * Update aom to 3.4.0
 * Update x264 to r3095
 * Update mbedTLS to 3.2.1
 * Update libsrt to 1.5.0
 * Update librist to 809390b3b7
 * Update AMF to 1.4.24
 * Update FFmpeg to 5.0.1
 * Update FreeType to 2.12.1
 * Update LuaJIT to 2.1 3065c910ad
 * Update SpeexDSP to 1.2.1
 * macOS: Update Jansson to 2.14
 * Windows: Update libogg to 1.3.5
 * Windows: Update libvorbis to 84c023699c
 * Windows: Update cmocka to bbf5ff7dd5
 * Windows: Update curl to 7.84.0
 * Windows: Update VulkanSDK to 1.3.216.0
 * Windows: Update nasm to 2.15.05
 * Windows: Update Python to 3.8.10
 * Qt: Update Qt5 to Qt 5.15.5 for Windows
 * Qt: Update Qt6 to Qt 6.3.1 for Windows
 * Qt: Update Qt5 to Qt 5.15.5 for macOS
 * Qt: Update Qt6 to Qt 6.3.1 on macOS
 * Qt: Backport Windows native scale factor fix
2022-07-30 00:14:56 -04:00
Matt Gajownik
54a9ae2ea1 docs/sphinx: Override RTD style
This fixes an issue where clickable references did not make it clear
that they were clickable.
2022-07-30 11:09:01 +10:00
Matt Gajownik
a1415f4bad docs/sphinx: RTD-friendly documentation changes 2022-07-30 11:09:01 +10:00
Matt Gajownik
ff555dd2b0 CI: Update docs to Sphinx v3, fix warnings
Sphinx 3 adds a number of C and C++ friendly directives, making
documenting our code much easier.
2022-07-30 11:09:01 +10:00