mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Code
6,324 Commits 16 Branches 211 Tags 169 MiB
89fbc5449e
Commit Graph

6324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
derrod
89fbc5449e UI: Show video container warning when selecting MOV 
MOV and MP4 are closely related and the warning message applies to both
of these container formats.

Closes #1683
 2019-03-02 23:28:50 -06:00
Colin Edwards
0f8c405e15
Merge pull request #1692 from pkviet/audiodisabled 
UI: Fix locale for 'disabled' devices in audio settings
 2019-03-01 12:57:50 -06:00
Colin Edwards
9340f9874d
Merge pull request #1680 from DDRBoxman/azure 
CI: macOS builds on Azure Pipelines
 2019-03-01 11:36:59 -06:00
Colin Edwards
a09ad610af CI: macOS builds on Azure Pipelines 2019-03-01 11:36:22 -06:00
Colin Edwards
1e0cb89db1
Merge pull request #1705 from DDRBoxman/qsvcrash 
obs-qsv11: Fix crash on destructor after init failure
 2019-02-28 20:14:16 -06:00
Colin Edwards
4f6d167951 obs-qsv11: Fix crash on destructor after init failure 2019-02-28 20:11:21 -06:00
Jim
709aac5188
Merge pull request #1704 from DDRBoxman/qsvcrash 
obs-qsv11: Don't try to free non allocated array on destruction
 2019-02-28 18:07:23 -08:00
Colin Edwards
d8f254550f obs-qsv11: Don't try to free non allocated array on destruction 2019-02-28 17:56:12 -06:00
jp9000
748067c930 obs-ffmpeg: Fix NVENC blacklisted card check 
Apparently, the parameters were the wrong way, making the test always
fail to detect a blacklisted adapter.
 2019-02-28 06:34:13 -08:00
jp9000
f2d7f5b2e7 obs-browser: Fix widgets being initially blank on high-DPI 2019-02-26 13:51:11 -08:00
jp9000
15b8ebb5e6 libobs: Update version to 23.0.1 2019-02-26 12:16:06 -08:00
jp9000
cea0a1e73a libobs-d3d11: Disable NV12 textures if NVENC unavailable 
On NVIDIA devices, disable NV12 textures if NVENC unavailable just as a
safety precaution.
 2019-02-26 12:09:00 -08:00
jp9000
340b8ec38e UI: Don't show "What's New" for new users 2019-02-26 12:00:27 -08:00
jp9000
587de2139d UI: Don't delete auto-remux file (just in case) 2019-02-26 11:29:00 -08:00
jp9000
ccd801b03e libobs-d3d11: Blacklist certain adapters from NV12 
Some older adapters apparently can't handle NV12 properly.  Wonderful.
 2019-02-26 08:37:55 -08:00
jp9000
6bf39f763d UI: Do not allow post-GPU rescaling on gpu encoders 2019-02-26 08:03:49 -08:00
jp9000
17e85f04fd libobs: Add func to get encoder caps by encoder pointer 2019-02-26 08:02:57 -08:00
jp9000
dccf686150 obs-ffmpeg: Fix bitrate being set on NVENC CQP/lossless 2019-02-26 07:43:38 -08:00
jp9000
ca6561758c UI: Fix Mixer allowing endless login retries 2019-02-26 07:24:22 -08:00
jp9000
1c4a6ca6c6 UI: Make workaround for Logitech plugin hard lock 
In commit d17ee20863, we attempted to fix a race condition crash in the
Logitech plugin by deferring the "stream/recording/replay buffer active"
calls to the UI thread.  However, the Logitech plugin loop_function
funciton can call obs_frontend_streaming_active/etc functions while the
UI thread waits for the loop_function thread for many OBS events,
causing a hard lock in the Logitech plugin.  This fixes that by making
the obs_frontend_streaming_active/etc functions completely atomic
instead.  It's a bit of a hack but it's better than accessing objects.
 2019-02-26 06:37:01 -08:00
jp9000
484c3847fc UI: Check CEF available when loading auth 2019-02-25 23:45:27 -08:00
jp9000
28860411dd libobs-d3d11: Improve check for NV12 texture support 
Checks to make sure that DXGI_FORMAT_NV12 is actually supported by the
GPU.
 2019-02-25 23:02:54 -08:00
pkv
f1cd604b62 UI: Fix locale for 'disabled' devices in audio settings 2019-02-25 23:06:10 +01:00
jp9000
8181f77609 UI: Rename a bunch of bad file names 2019-02-25 12:19:22 -08:00
jp9000
b1dfc9ccda image-source: Change max loaded slideshow images to 21 
Just gives a bit more breathing room before images start having to load.
 2019-02-25 08:21:28 -08:00
jp9000
5dca0fde5b enc-amf: Update translations 2019-02-25 08:07:08 -08:00
jp9000
a87afeb69b obs-ffmpeg: Add more blacklisted NVENC adapters 2019-02-25 08:05:38 -08:00
Gol-D-Ace
98f78fe3a7 Update translations from Crowdin 2019-02-25 15:11:33 +01:00
Jim
59b0b6fdbd
Merge pull request #1689 from cg2121/fix-replaybuffer-check-state 
UI: Fix replay buffer checked state when no hotkey is set
 2019-02-25 05:47:39 -08:00
Clayton Groeneveld
178fb21593 UI: Fix replay buffer checked state when no hotkey is set 2019-02-25 07:07:22 -06:00
Gol-D-Ace
d5e7ba511d UI: Refine strings for About dialog 2019-02-25 00:28:08 +01:00
Gol-D-Ace
ec42739ad5 Update translations from Crowdin 2019-02-24 23:26:47 +01:00
jp9000
e5fc045402 UI: Force Twitch moderation tools to system browser 
In the Twitch chat dock window, the "Moderation Tools" link in the chat
settings should not navigate the window to the new URL; it should pop up
the URL in the user's system browser instead.
 2019-02-24 01:02:06 -08:00
Richard Stanway
61e3a9084b
Merge pull request #1681 from Lordmau5/master 
UI: Fix wrong filename building for Remux dialog
 2019-02-24 01:44:43 +01:00
Lordmau5
af4c3ad030 UI: Fix wrong filename building for Remux dialog 2019-02-24 01:24:16 +01:00
jp9000
ef270c8ba0 obs-ffmpeg: Free NVENC textures after sending EOS 
Prevents a crash when using the new lookahead feature, presumably
because those textures are in use when the EOS is sent.
 2019-02-21 03:12:12 -08:00
jp9000
88247dae36 libobs: Update version to 23.0.0 2019-02-20 22:16:45 -08:00
jp9000
6e533d9a8a obs-browser, obs-vst: Update translations 2019-02-20 19:57:41 -08:00
jp9000
aaeb14ea64 UI: If auth startup failed, keep connected in settings 
If the auth process failed on startup, the user is still able to use
their stream, just without the extra UI.  The auth object is still
technically existing, and the user can still stream, so don't treat it
like it's not connected in settings.
 2019-02-20 19:22:33 -08:00
jp9000
9ffe7f5f94 UI: If Twitch account disconnected, retry login 
If the user disconnects OBS from their Twitch account on their Twitch
settings panel, then try asking the user if they'd like to reconnect
before throwing an error.
 2019-02-20 19:22:33 -08:00
jp9000
c144609ceb UI: If Mixer account disconnected, retry login 
If the user disconnects OBS from their Mixer account on their Mixer
settings panel, then try asking the user if they'd like to reconnect
before throwing an error.
 2019-02-20 19:22:33 -08:00
Colin Edwards
0170278ae2 UI: Fix scene list text edit sizing on dark theme 2019-02-20 20:24:55 -06:00
jp9000
eaf348decb UI: Actually fix non-windows compilation 
This is a little bit embarrassing.  We'll just pretend we didn't see
that.
 2019-02-20 18:01:42 -08:00
jp9000
f6225719cc UI: Fix non-windows compilation 2019-02-20 18:00:44 -08:00
jp9000
01c78bffc5 UI: Do not display threaded message boxes on startup 
The message boxes that tell you that the browser is initializing or that
you're authenticating with twitch are annoying on startup.  It makes
sense to do it in the settings/autoconfig dialogs where you sort of need
to know what's going on while waiting for it to connect, but on startup
it's not really necessary and can be kind of annoying.
 2019-02-20 17:35:02 -08:00
jp9000
0e4bef09f4 UI: Defer autoconfig to message queue 
The Auto-Configuration dialog was being created outside of the Qt
message loop, which could cause a lockup with auth code.
 2019-02-20 17:35:02 -08:00
Colin Edwards
33e4de5be6 obs-text: Use custom draw flag 
Fixes filters while preserving premult alpha
 2019-02-20 19:02:44 -06:00
Gol-D-Ace
c3711bdd5e Update translations from Crowdin 2019-02-20 22:26:07 +01:00
jp9000
4722b764ca UI: Set replay buffer check w/ --startreplaybuffer 
When starting the program with the --startreplaybuffer command line
parameter, it would not correctly highlight the button.
 2019-02-19 19:27:54 -08:00
jp9000
103bec6526 UI: Fix disabling "resize output to source" 
This should always be disabled if video output is active.  Additionally,
the expression used to determine whether it should be enabled/disabled
was very unreadable.
 2019-02-19 19:26:37 -08:00