mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-03-16 21:47:45 -04:00
Code Issues Packages Projects Releases Wiki Activity
12,505 Commits 18 Branches 241 Tags
ddee7ff6feeea36ac449dc6077c6123f7889dc4e
Commit Graph

12505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jpark37
ddee7ff6fe decklink-output-ui: Align render output paths 
Use the render path that preview uses for non-preview rendering, which
uses the GPU to rescale rather than the CPU and pulls the image from the
GPU before pixel format conversion happens. This means it's no longer
necessary to select BGRA to use the keyer anymore.
 2023-03-24 15:18:45 -07:00
jpark37
e32c2c1427 libobs: Add callback for main texture rendered 
Useful for redirecting main texture to DeckLink output for example.
 2023-03-24 15:18:45 -07:00
jpark37
feae65c472 graphics-hook: Handle VK_KHR_imageless_framebuffer 
Applications that use this Vulkan extension would have image usage
mismatches because we add VK_IMAGE_USAGE_TRANSFER_SRC_BIT to
VkSwapchainCreateInfoKHR::imageUsage, so make the same modification to
VkFramebufferAttachmentImageInfo::usage.
 2023-03-24 15:17:43 -07:00
Yuriy Chumak
1a05097304 obs-ffmpeg: Add HDR and HEVC to VA-API encoder 2023-03-24 15:16:10 -07:00
tytan652
6f755451d9 rtmp-services: Set protocol in rtmp_common if none set 2023-03-24 16:07:40 -04:00
tytan652
21289b2777 UI: Save protocol in non-custom services 2023-03-24 16:07:40 -04:00
derrod
a73e13eeeb libobs: Keep mixer data for placeholder sources 
Placeholder sources are created when a plugin providing a source type is
unavailable. Since they're not marked as having audio any audio track
settings for them get lost. With this change we retain mixer information
if the source owns its id to avoid that.
 2023-03-24 12:16:32 -04:00
tytan652
3c909558fa UI: Make simple audio codec name translatable 
Also adds "(Default)" to the AAC combobox option.
 2023-03-24 09:14:09 +01:00
tytan652
04a4f2b725 UI: Fix simple fallback audio codec name 2023-03-24 09:14:09 +01:00
PatTheMav
fe34045d6a UI: Remove unused variables to fix errors in the CMake 3.0 rework 2023-03-23 16:48:59 -04:00
Norihiro Kamae
81117fa5cb UI: Separate translation of filename format tooltip 
The tooltip string describing the filename format had many lines. It
made difficult for translators to update newly added format strings.
This commit separates the string so that each format string has each
translation.
Also construct HTML so that the column aligns.
 2023-03-23 23:00:47 +11:00
tytan652
f2f00f1676 UI: Fix audio archive encoder using the stream track 2023-03-22 15:30:56 -04:00
Matt Gajownik
f1e728ea03 obs-browser: Update version to 2.20.0 
30d2b6f - Add ability to zoom browser docks with Ctrl - and +
cbad08a - Use officially documented data type to persist CEF preferences
4236b56 - Persist CEF Preferences
501f624 - Add proc handler for javascript event
5a55d18 - Replace SIGNAL and SLOT macro with new style
72afb16 - Increased maximum width and height
e9eb123 - Fix leak with SchemeHandlerFactory
ea9f59d - Fix issue with unknown speaker layouts
00f1396 - Remove redundant macOS hardware acceleration check
c2aaaef - Move custom FPS property next to its FPS
 2023-03-22 08:51:52 +11:00
Exeldro
b11d61c89f UI: Add space for right arrow in menu 2023-03-21 16:09:27 -04:00
tytan652
d529f2c35f UI: Fix inconsistencies in FindProtocol 
- Fallback to RTMP if custom server is empty.
- Check if RTMPS is supported since OBS Studio can be built without it.
 2023-03-21 15:17:15 -04:00
Matt Gajownik
1af982fcfa rtmp-services: Fix formatting and indentation of services schema 
Also define editorconfig for rtmp-services to match existing structure.
 2023-03-21 20:58:05 +11:00
tytan652
070c2ec616 CI: Avoid installing recommended package on Ubuntu 2023-03-20 19:00:24 -04:00
tytan652
3f9b2d627e CI: Add nlohmann JSON, WebSocket++ and Asio on Linux 
Those libraries will be kept in the Flatpak to allow plugins to use the
same versions of those headers-only libraries.
 2023-03-20 19:00:24 -04:00
tytan652
8c11b0caad cmake: Add finders for Asio and WebSocket++ 
WebSocket++ does provide a CMake package, but version check is broken.
 2023-03-20 19:00:24 -04:00
Ryan Foster
b262eeab12 CI: Update deps to 2023-03-20 release 
Notable changes:
 * deps.ffmpeg: Update libpng to 1.6.39
 * deps.ffmpeg: Update opus to 8cf872a186
 * deps.ffmpeg: Update libvpx to 1.13.0
 * deps.ffmpeg: Update SVT-AV1 to 1.4.1
 * deps.ffmpeg: Update aom to 3.6.0
 * deps.ffmpeg: Update x264 to r3106
 * deps.ffmpeg: Update mbedTLS to 3.3.0
 * deps.ffmpeg: Update nv-codec-headers to 12.0.16
 * deps.ffmpeg: Update FFmpeg to 6.0
 * deps.ffmpeg: Fix AOM target CPU arch
 * deps.macos: Update LuaJIT to 2.1 505e2c03de
 * deps.macos: Update libpng to 1.6.39
 * deps.macos: Update FreeType to 2.13.0
 * deps.windows: Update mbedTLS to 3.3.0
 * deps.windows: Update FreeType to 2.13.0
 * deps.windows: Update cmocka to 1.1.7
 * deps.windows: Update curl to 7.88.1
 * deps.windows: Update LuaJIT to 2.1 505e2c03de
 * deps.windows: Update Zstandard to 1.5.4
 * deps.qt: Backport macOS accessibility keyboard crash fix
 * deps.qt: Update Qt5 to 5.15.8 for Windows
 * deps.qt: Update Qt6 to 6.4.3 for Windows
 * deps.qt: Update Qt5 to 5.15.8 for macOS
 * deps.qt: Update Qt6 to 6.4.3 for macOS
 2023-03-20 18:24:37 -04:00
Jim
1ea5917973 image-source: Add slide_changed signal 
Allows a plugin or script to know when a slide has changed, and which
index/file it's switched to
 2023-03-20 11:31:21 -07:00
derrod
f96ae65d1b obs-ffmpeg: Pass correct audio codec to muxer subprocess 2023-03-20 17:01:47 +01:00
derrod
198debe945 ffmpeg-mux: Set experimental compliance for FFmpeg < 6.0 
With 5fe417bce1 it became possible to use
Opus in local recordings, this could potentially have the user try to
record Opus in MP4.

FLAC in MP4 was marked as stable in FFmpeg 6.0
Opus in MP4 was marked as stable in FFmpeg 4.3

For Ubuntu 20.04 we still need the latter, for 22.04 (and potentially
other Linux distributions) the former.

While FLAC is not yet implemented, we may want to do that in the near
future so for simplicity just keep it at 6.0.
 2023-03-20 17:01:47 +01:00
Jim
e9ef38e3d3 Merge pull request #7978 from jpark37/dxgi-display-sdr-on-hdr 
libobs-d3d11,win-capture: Add Force SDR for DXGI duplicator
 2023-03-20 01:43:14 -07:00
Jim
0a9ed4569b Merge pull request #7814 from jpark37/decklink-preview-rescale 
decklink: Move preview output rescaling to GPU
 2023-03-20 01:42:36 -07:00
jpark37
c2afa58125 libobs: Enable fast clear on Windows always 
NVIDIA driver 527.37 fixes flickering when multiple GPUs are installed.
 2023-03-20 01:41:47 -07:00
tytan652
eef63cd188 UI: Enforce stream audio to Opus if service is FTL 2023-03-20 01:09:52 -07:00
tytan652
b2f25fb4b9 UI: Default advance record audio to AAC 2023-03-20 01:09:52 -07:00
Jim
48293629b6 Merge pull request #8095 from tytan652/service_get_info 
RFC 45-6: Enable more connection info in Services API
 2023-03-19 19:25:20 -07:00
tytan652
215426b65b UI: Use connect infos check in before stream check 
Ask the service directly rather than checking the presence of a key and
a URL.
 2023-03-19 18:27:44 +01:00
tytan652
d917ceafe8 rtmp-services: Add connect infos checks 2023-03-19 17:38:02 +01:00
tytan652
22ebed8d02 libobs,docs: Add connect infos check to the Services API 
This new function allows to know if the service has all the info needed
to try to connect.
 2023-03-19 17:38:02 +01:00
tytan652
5e4ed49a2d obs-outputs,obs-ffmpeg: Use connect infos in outputs 2023-03-19 17:38:02 +01:00
tytan652
258e339d2f rtmp-services: Add connect infos to services 2023-03-19 17:38:02 +01:00
tytan652
ea4ac2d08d libobs,docs: Add connect infos to the Services API 
This replace and deprecate url, key, username and password functions.
 2023-03-19 17:38:02 +01:00
tytan652
5fe417bce1 UI: Add audio codec selections 2023-03-19 17:27:43 +01:00
tytan652
b15684aa17 UI: Add Opus bitrate map and per encoder bitrate list 
Also refactors AAC bitrate map too.
 2023-03-19 17:27:43 +01:00
tytan652
b2d686e8f4 obs-ffmpeg: Allow opus for SRT and RIST 2023-03-19 17:27:43 +01:00
tytan652
cd83b94c7c plugins: Rename audio encoders 2023-03-19 17:27:43 +01:00
tytan652
1514f1597a plugins: Fix codec name on AAC encoders 2023-03-19 17:27:42 +01:00
tytan652
aeab6b8fc4 libobs,docs,rtmps-services: Add supported audio codecs 
Also remove Opus-only "supported audio codecs" in the services JSON.
 2023-03-19 17:27:42 +01:00
tytan652
ea2858705c UI: Select streaming output based on the protocol 2023-03-19 17:16:13 +01:00
tytan652
213eb613d3 rtmp-services: Remove output getter from rtmp_common 2023-03-19 17:16:13 +01:00
tytan652
1e0f4a6ebf libobs,docs: Add preferred output type to Service API 2023-03-19 17:16:13 +01:00
tytan652
e317c88f55 obs-ffmpeg: Remove AV1 from SRT/RIST supported codecs 
MPEG-TS standard is not ready for AV1
 2023-03-19 17:08:06 +01:00
tytan652
8d6cacc35b UI: Remove hardcoded stream codec list 2023-03-19 17:08:06 +01:00
tytan652
44ca002d02 UI: Use protocol to enable network options 2023-03-19 17:08:06 +01:00
tytan652
9d8d98b142 rtmp-services: Remove fallback to H264 if no codec found 
The fallback in now inside the output.
 2023-03-19 17:08:06 +01:00
tytan652
e00e2712cf UI: Use protocol to list compatible codecs 2023-03-19 17:08:06 +01:00
tytan652
5a409347d5 UI: Refactor Qt slots in stream settings page 2023-03-19 16:49:56 +01:00