Commit Graph

7972 Commits (19c5da4645a66cc44ef6ae8ae38c1155f8d536b0)

Author SHA1 Message Date
jpark37 3439be57fe win-capture: Support VK_FORMAT_A8B8G8R8_UNORM_PACK32 2020-03-07 09:58:07 -08:00
jp9000 f60c961ae1 obs-ffmpeg: Make sure hotkeys are actually pressed
Explicitly checks to make sure hotkeys are actually down, rather than
both down and up.  This was causing the restart hotkey to restart the
media twice, once on key down, once on key up.
2020-03-07 08:14:44 -08:00
jp9000 87f5bd6e9f win-capture/graphics-hook: Fix wrong HWND
Game capture assumes the top-level ancestor HWND, not a child HWND.
This fixes bugs such as the VLC window not capturing anymore due to the
fact that the capture HWND of VLC is a child window of the main VLC
window and not the main VLC window itself.
2020-03-07 07:35:34 -08:00
jp9000 40817331d3 win-dshow: Fix rotation not working in all cases 2020-03-07 06:48:07 -08:00
Jim c8bafff16a
Merge pull request #2467 from FlyGoat/lp64
Fix build for armhf and powerpc
2020-03-07 04:47:00 -08:00
Jim abff240d2a
Merge pull request #2466 from jpark37/win-capture-cleanup
win-capture clean-up
2020-03-07 04:46:13 -08:00
jp9000 5dcad74019 win-capture: Set ALL APPLICATION PACKAGES perms if elevated 2020-03-07 04:01:13 -08:00
jp9000 e7b0a45126 UI/updater: Add perms for ALL APPLICATION PACKAGES
Adds hook dir perms for ALL APPLICATION PACKAGES, which enables capture
on microsoft store games
2020-03-07 03:37:19 -08:00
jp9000 465174413a win-capture: Remove microsoft store from capture blacklist 2020-03-06 21:53:53 -08:00
Jiaxun Yang 3b39a0af74 linux-v4l2: Use LP64 macro to determine pointer size
As currently all 64bit Linux platforms are respecting LP64
data model and most 32bit platforms are respecting ILP32, we
don't have to discuss pointer size case by case. LP64 is effective
enough to tell pointer size.

This fixes build for armhf and powerpc.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
2020-03-07 09:56:01 +08:00
jpark37 9da6a4d6f6 win-capture: Vulkan capture clean-up
Remove unnecessary DXGI swap chain creation, and use VK_NULL_HANDLE.
2020-03-06 17:04:31 -08:00
jpark37 fc4f3c0934 win-capture: Clean up various VC++ warnings 2020-03-06 17:02:38 -08:00
Richard Stanway 452a4b5085 obs-outputs: Fix RTMP authentication
RTMP authentication requires the curStreamIdx and nStreams be set
between the disconnect / reconnect that occurs in PublisherAuth. Now
that there's no good place to clean them up, zero the whole rtmp->Link
before starting a new stream.
2020-03-06 22:52:50 +01:00
Jim 52996158b3
Merge pull request #2464 from craftwar/warning
win-capture: Fix format string warning
2020-03-06 05:09:41 -08:00
craftwar 3821a0344e win-capture: Fix format string warning 2020-03-06 19:52:02 +08:00
jp9000 72bb592673 win-capture: Increment graphics hook version 2020-03-06 03:39:56 -08:00
Jim 005de86f21
Merge pull request #2463 from jpark37/filter-ref-count
libobs: Only manipulate input source ref counts
2020-03-06 03:39:06 -08:00
Jim 890e63379b
Merge pull request #2462 from jpark37/vulkan-null-fix
win-capture: Handle NULL VkApplicationInfo
2020-03-06 03:38:49 -08:00
Jim a373267c17
Merge pull request #2459 from VodBox/sl-scene-source-fix
UI: Fix scenes as sources for SL import
2020-03-06 03:38:30 -08:00
jpark37 6d5bb8b244 libobs: Only manipulate input source ref counts
Filters can be hidden without being shown, which can unbalance the ref
count and destroys them prematurely. We really only care about input
sources having a chance to clean up from the render thread from the hide
handler, Windows 10 window capture specifically.
2020-03-06 01:14:38 -08:00
jpark37 c706a7bed5 win-capture: Handle NULL VkApplicationInfo 2020-03-05 21:20:00 -08:00
Jim 325e0586bb
Merge pull request #2461 from cg2121/fix-override
UI: Fix override transition not working
2020-03-05 17:11:04 -08:00
Clayton Groeneveld 18f41afa18 UI: Fix override transition not working 2020-03-05 16:42:25 -06:00
Jim 9719fb26ca
Merge pull request #2460 from cg2121/t-bar-fix
UI: Do not disable t-bar
2020-03-05 10:57:41 -08:00
Clayton Groeneveld b240a5671b UI: Do not disable t-bar 2020-03-05 09:11:17 -06:00
VodBox 7553fda3e5 UI: Fix scenes as sources for SL import
The previous fix for repeated names accidentally meant that if a scene
item in a scene was meant to show another scene that was lower in the
list, it would fail to create the item, and wouldn't make it into the
imported collection.

This fix makes sure that scenes as sources still works properly in that
situation.
2020-03-05 22:38:45 +13:00
waffeln 46dcc9c2fb UI: Lower minimum dock size
Closes obsproject/obs-studio#2448
2020-03-04 22:25:39 -08:00
jp9000 ec247ba982 win-capture: Find correct window even if it's minimized
In window capture, it will search for a window with a specific title,
but will not search minimized windows.  This fixes that by making is
acquire the correct window even if that window is minimized, rather than
potentially risk it capturing the wrong window of the same type.
2020-03-04 22:21:45 -08:00
Jim 4f6ab0b2f2
Merge pull request #2458 from pkviet/srtfix
obs-ffmpeg: Fix some incorrect settings for srt output
2020-03-04 22:18:19 -08:00
Colin Edwards f0fe107515 CI: macOS use qt 5.14.1 2020-03-04 21:48:26 -06:00
pkv 759aa079e7 obs-ffmpeg: Fix some incorrect settings for srt output
This fixes some configuration parameters which were incorrect (for audio).
2020-03-05 00:03:13 +01:00
Richard Stanway 7df435f2cf UI: Remove unused variable 2020-03-04 23:35:28 +01:00
Jim 934a9e8bae
Merge pull request #2457 from VodBox/sl-dup-fix
UI: Fix importing SL collections with repeated names
2020-03-04 14:29:12 -08:00
Richard Stanway 5cfc16e9f9 UI: Call setWindowFlags before setupUi
For some reason this has a noticeable performance improvement,
presumably because Qt is notifying all the child widgets?
2020-03-04 23:20:19 +01:00
VodBox 6b5459fbe7 UI: Fix importing SL collections with repeated names 2020-03-05 10:37:37 +13:00
jp9000 eba6810423 obs-browser: Fix CEF initialization conflict
Fixes a CEF initialization issue where CefInitialize would internally
call a Chromium function that would change process permissions.  The
permissions it changed would break other functionality within the
program, such as the new window capture method based upon
Window.Graphics.Capture.
2020-03-04 06:16:10 -08:00
Jim dca56252c4
Merge pull request #2452 from WizardCM/dynamic-rename
UI: Dynamically set widget index when renaming sources
2020-03-04 01:37:33 -08:00
Matt Gajownik c50f488085 UI: Dynamically set widget index when renaming sources 2020-03-04 19:22:30 +11:00
Jim cb970d0cb9
Merge pull request #2451 from jpark37/disable-incremental-link
CMake: Disable incremental linking on Windows
2020-03-03 23:30:55 -08:00
jpark37 f3e6bfdc59 CMake: Disable incremental linking on Windows
Not compatible with /OPT:REF, and caused warnings.
2020-03-03 23:13:03 -08:00
jp9000 d5974b9e30 win-capture: Disable correct capture method index
When "Automatic" was added, the index for the item that needed to be
disabled became incorrect (to disable WCG).
2020-03-03 21:09:54 -08:00
Jim a0f700e737
Merge pull request #2450 from jpark37/opt-ref
CMake: Enable /OPT:REF for Windows
2020-03-03 20:40:35 -08:00
jpark37 9abdf2eec7 CMake: Enable /OPT:REF for Windows 2020-03-03 20:18:43 -08:00
Colin Edwards e99849e1fc
CI: Remove merge conflict bot for now 2020-03-03 20:23:25 -06:00
Colin Edwards 91d5a9c895 CI: Fix some macOS build settings 2020-03-03 20:20:12 -06:00
VodBox 9aedc7e5b7 win-capture: Prevent WGC being selected when unavailable 2020-03-03 23:06:25 +13:00
Richard Stanway 8f4f33aed8 UI: Move OBSBasicSettings to scoped block
This ensures that the OBSBasicSettings destructor has been run before
the restart prompt appears, preventing bugs related to OBS shutting down
with the settings window still having active callbacks.
2020-03-03 00:05:43 +01:00
Richard Stanway 2f0134bf60 UI: Don't add removed sources when refreshing LoadAudioSources
This can be fired by a callback during source removal. The code was
re-adding the source that was just removed, causing the program to
freeze when trying to remove all sources.
2020-03-02 22:23:13 +01:00
Richard Stanway 2a4a46deed UI: Use invokeMethod to refresh LoadAudioSources
Sources may be removed or destroyed by other threads which resulted in
GUI calls outside of the main Qt thread.
2020-03-02 22:21:02 +01:00
Richard Stanway 57b47ca90a UI: Fix preview not being re-enabled on maximize 2020-03-01 10:02:14 -08:00