jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,236 Commits 1 Branch 0 Tags
Commit Graph

6236 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Edwards
22f856bb7d decklink-output-ui: Add note about keyer output 2019-02-13 00:23:05 -06:00
jp9000
b63e7fbcb5 libobs: Fix indent 2019-02-12 19:33:13 -08:00
jp9000
573197af5b libobs: Fix race conditions 
Uses obs_source_get_ref on the sources enumerated in the tick_sources
function in obs-video.c to ensure a reference has been incremented
before calling that source's video_tick, and replaces an
obs_source_addref with obs_source_get_ref in the push_audio_tree
function in obs-audio.c to ensure that it cannot increment a source that
has already decremented its reference to 0.
 2019-02-12 19:23:24 -08:00
jp9000
131fb7b460 libobs: Fix potential race condition on shutdown 
If the remove_connection call of obs_encoder_stop_internal took too
long, obs_encoder_destroy could get called before that function
completed, causing a race condition.
 2019-02-12 16:07:14 -08:00
jp9000
cf004ba3fe UI: Add default preset for NVENC in simple output 2019-02-12 16:07:14 -08:00
Richard Stanway
3d27e7c2c9 decklink-ouput-ui: Remove unused help icon 2019-02-12 12:58:28 +01:00
Richard Stanway
917318d8e8 frontend-tools: Remove unused help icons 2019-02-12 12:57:18 +01:00
Richard Stanway
43fbefb9ef UI: Remove additional unused help icons 2019-02-12 12:55:31 +01:00
Colin Edwards
55cee6ca0a
Merge pull request #1659 from DDRBoxman/leak 
decklink-output-ui: Fix memory leak in save settings
 2019-02-11 21:17:39 -06:00
jp9000
c372d26c02 win-capture: Don't try to find window every frame 
When window capture is not capturing a window, don't try to find the
window every frame.  Instead, just check once per frame.  The process of
finding a window has a lot of checks and requires a surprising amount of
processing.
 2019-02-11 17:57:24 -08:00
jp9000
0948e8a629 obs-ffmpeg: Mark unused parameter 2019-02-11 17:34:07 -08:00
Colin Edwards
c8b58d8749 decklink-output-ui: Fix memory leak in save settings 2019-02-11 19:33:41 -06:00
jp9000
e49bba3292 obs-ffmpeg: Don't expose new settings to old NVENC (yet) 2019-02-11 17:33:17 -08:00
jp9000
f3b8b2ec49 UI: Don't enable rescale if on "Use stream encoder" 
Fixes a bug where if you set the advanced output recording encoder to
"use stream encoder", then reopened the settings window, that option
would become enabled again.
 2019-02-11 17:12:34 -08:00
jp9000
83f0b98387 UI: Fix encoder preset locale text 2019-02-11 16:58:45 -08:00
jp9000
1b8ecae3b9 UI: Fix potential race condition for hover items 
The graphics thread should not be accessing any Qt objects that aren't
guaranteed to exist.  Instead, store the currently hovering list/preview
scene items in the preview class.
 2019-02-11 15:30:56 -08:00
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 6629c5d7b8f93da7f7c65f790d54f22949b79ac2.

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 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