Commit Graph
6220 Commits
Author SHA1 Message Date
jp9000 7068e61fd9 UI: Add OBSBasicPreview::Get helper func 2019-02-11 15:30:56 -08:00
Jim 25bc6db718 Merge pull request #1658 from cristisilaghi/master2
obs-ffmpeg: Fix crash when audio not configured
2019-02-11 13:04:23 -08:00
Cristian Silaghi 4c293b9755 obs-ffmpeg: Fix crash when audio not configured 2019-02-11 22:17:41 +02:00
Jim df89820d14 Merge pull request #1657 from SuslikV/patch-13
UI: Add missing text string for Remux dialog
2019-02-11 09:18:18 -08:00
SuslikV a497d22659 UI: Add missing text string for Remux dialog 2019-02-11 18:48:36 +02:00
Richard Stanway e0c3e1e957 UI: Allow compressed responses in RemoteTextThread 2019-02-11 15:09:19 +01:00
jp9000 47ba3e8c22 image-source: Defer update of slideshow source
Defers the update of the slideshow source until the user has pressed OK
or exited the properties dialog.  This ensures images aren't reloaded
every time the user adjusts a setting.
2019-02-10 23:06:20 -08:00
jp9000 1b45007530 Revert "UI: Use Twitch dashboard chat popout"
This reverts commit 6629c5d7b8.

Chat redirect only happens on raid, which is when you are ending your
stream.  That's acceptable behavior for the main chat window.
2019-02-10 22:50:46 -08:00
jp9000 6629c5d7b8 UI: Use Twitch dashboard chat popout
This uses the dashboard chat popout instead of the normal chat popout in
order to ensure that the chat doesn't get redirected for raids/hosts.
2019-02-10 22:41:00 -08:00
jp9000 3f59e2fb13 UI: Remove help icon from auth/what's new titlebars 2019-02-10 22:31:59 -08:00
jp9000 d416f781fd libobs: Fix crash starting raw encoder before gpu encoder
Fixes a crash when starting a raw encoder before a GPU encoder.
2019-02-10 22:22:31 -08:00
jp9000 43f75ed02b UI: Add minimum size of OAuth login dialog 2019-02-10 22:19:00 -08:00
jp9000 975bed8935 UI: Fix autoconfig authentication not working
ServiceChanged() is used with multiple widgets, and should only be
cleared when the actual service has changed.
2019-02-10 22:09:58 -08:00
jp9000 b029453d30 libobs: Fix texture-based encoder decklock
Ensures that there are no textures being encoded before attempting to
shut down a texture-based encoder.
2019-02-10 21:53:24 -08:00
jp9000 c284d26163 UI: Increase Twitch "Stream Stats" height by 50
The default size was too small for affiliates/partners, and would cut
off subscribers.
2019-02-10 18:34:22 -08:00
jp9000 c07c5bb5f3 UI: Allow animated BTTV emojis 2019-02-10 18:22:03 -08:00
Colin Edwards 1af8789ce0 decklink-output-ui: Fix memory leak
Closes obsproject/obs-studio#1656
2019-02-10 18:16:10 -08:00
jp9000 53ba6c0350 UI: Enter graphics context before destroying texture
Fixes a memory leak where the texture would not be properly freed.
2019-02-10 18:13:21 -08:00
jp9000 2a92555f58 libobs: Make sure to destroy effect
This actually isn't necessary because the graphics subsystem technically
automatically frees effects, but that could change, so call this just to
be safe.
2019-02-10 18:12:37 -08:00
jp9000 8c819f9bbd UI: Make "What's New" dialog modeless 2019-02-10 16:27:51 -08:00
jp9000 0d4693e015 obs-ffmpeg: Add a few line breaks for new tooltips 2019-02-10 15:43:08 -08:00
jp9000 b5e1a797c2 UI: Check that CEF loaded before loading integrations
Fixes a case where a certain plugin that entirely replaces OBS's own
browser plugin would cause OBS to crash with the new service
integration.  ..Yea.
2019-02-09 23:09:47 -08:00
Jim 6d84bc4b03 Merge pull request #1654 from VodBox/nvenc-cqp
obs-ffmpeg: Use CQP in jim-nvenc properties text
2019-02-09 16:38:19 -08:00
VodBox 81dc78f50f obs-ffmpeg: Use CQP in jim-nvenc properties text 2019-02-10 13:23:05 +13:00
jp9000 476716798b UI: Fix being unable to drag/drop source list items 23.0.0-rc1 2019-02-09 12:56:48 -08:00
jp9000 2680fb00b1 UI: Fix issue with Mixer
Mixer was using the Twitch ID.
2019-02-09 12:26:34 -08:00
jp9000 5d05ab6df6 UI: Do one time reset of dock lock state for v23
In order to make for a better user experience with service integration,
do a one-time reset of the docks locked state, and set the default lock
state to off.
2019-02-09 01:12:18 -08:00
jp9000 8fb36700b2 obs-ffmpeg: Add tooltips for new NVENC settings 2019-02-09 01:12:18 -08:00
Jim aa9f226aec Merge pull request #1653 from WizardCM/projector-monitor-count
UI: Start projector user-facing monitor count at 1
2019-02-09 00:46:58 -08:00
Matt Gajownik 6555db7c45 UI: Start projector user-facing monitor count at 1
Consistent with #1638
2019-02-09 19:34:56 +11:00
Warchamp7 b9510dac52 UI: Adjust Acri and Rachni themes
Various tweaks and adjustments to Acri and Rachni for 23.0

Closes obsproject/obs-studio#1652
2019-02-09 00:16:16 -08:00
Gol-D-Ace 133b9462e1 CI: Build service-integration on Windows 2019-02-09 07:07:36 +01:00
jp9000 71130137f3 image-source: Increase slideshow max loaded to 15 2019-02-08 19:00:38 -08:00
jp9000 ecdae0d417 obs-ffmpeg: Disable psycho_aq by default (for now) 2019-02-08 16:16:41 -08:00
jp9000 58be029b14 UI: Fix twitch stream stat window not centering
Fixes an issue where if you auth to twitch, then close the program
without unhiding the twitch stream stats panel, the next time that panel
was unhidden it would be at position 0,0 on your screen.  This
explicitly sets its position to be center of the window beforehand to
ensure that won't occur.
2019-02-08 14:50:50 -08:00
jp9000 96644b31ad UI: Add bttv emote button to Twitch chat window 2019-02-08 01:00:21 -08:00
Jim bb580c7c03 Merge pull request #1611 from VodBox/misc-ux-changes
UI: Scene item overflow, handle/outline change and hover outline
2019-02-08 00:56:14 -08:00
VodBox 6c880fb3c8 UI: Change preview handles/outline and add hover 2019-02-08 20:58:40 +13:00
VodBox f095cb2d0e UI: Add scene item canvas overflow to preview 2019-02-08 20:38:53 +13:00
jp9000 a249d26eaa obs-ffmpeg: Do not allow new NVENC on gpu idx > 0
Because the new NVENC implementation requires texture sharing, if the
user chooses to use a secondary GPU, fall back to the old implementation
instead.
2019-02-07 22:47:50 -08:00
Jim e60023daf5 Merge pull request #1502 from DDRBoxman/decklinkoutui
Decklink: Add UI to control output
2019-02-07 22:12:54 -08:00
Michael Fabian 'Xaymar' Dirks 656dcf4efa enc-amf: Update plugin to Version 2.5.1
Fixes the Profile Level problem with integrated AMD Vega GPUs.

(Jim: Also fixes an issue where the amf-test executable would not build)

Closes obsproject/obs-studio#1619
2019-02-07 18:49:31 -08:00
jp9000 79613b6696 UI: Use new NVENC by default in simple output mode
If the new texture-based NVENC implementation is available, uses it by
default when a user is using simple output mode.
2019-02-07 17:00:47 -08:00
jp9000 ed0c7bcd6a obs-ffmpeg: Add texture-based NVENC encoder implementation
Adds a texture-based NVENC implementation which passes OBS NV12 output
textures directly to NVENC without downloading them off of the GPU,
increasing NVENC performance by a significant margin.

If NV12 textures are unavailable or the new encoder fails to initialize
for whatever reason, it will fall back to the FFmpeg NVENC
implementation safely.
2019-02-07 17:00:47 -08:00
jp9000 8b566f3352 obs-ffmpeg: Update NVENC properties and property defaults
Adds VBR rate control mode, adds a lookahead option, adds psycho visual
tuning option, removes level property (now always set to 'auto'),
removes "2pass" option (replaced by new "Max Quality" preset which uses
2pass by default), modifies a few defaults, and updates their locale
text.
2019-02-07 17:00:47 -08:00
jp9000 9c11772682 obs-ffmpeg: Update display name of FFmpeg NVENC encoder 2019-02-07 17:00:47 -08:00
jp9000 c3f3aa7f25 obs-ffmpeg: Update nvEncodeAPI.h to latest version 2019-02-07 17:00:47 -08:00
jp9000 f5ad8b5d67 UI: If hardware encoder selected, disable post rescale
The post-output rescale option in advanced output mode cannot currently
be used with texture-based encoders, so disable the option when a
texture-based encoder is selected.
2019-02-07 17:00:47 -08:00
jp9000 9fee895359 UI: Use hardware encoding by default if available
If the user doesn't use the auto-configuration on first use, set the
default encoders used in simple output mode to hardware encoders.
2019-02-07 17:00:46 -08:00
jp9000 93ba6e7128 libobs: Add texture-based encoding support
Allows the ability to encode by passing NV12 textures.  This uses a
separate thread for texture-based encoders with a small queue of
textures.  An output texture with a keyed mutex shared texture is locked
between OBS and each encoder.  A new encoder callback and capability
flag is used to encode with textures.
2019-02-07 17:00:46 -08:00