0
0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 04:42:18 +02:00
Commit Graph

7175 Commits

Author SHA1 Message Date
Matt Gajownik
51be039cf8 CMake: Build Windows modules with file descriptors 2019-10-15 21:34:12 +11:00
Jim
5ea62d5ef6
Merge pull request #2075 from luzpaz/misc-typos
Fix various typos
2019-10-14 23:29:10 -07:00
luz.paz
d124e6402c docs/sphinx: Fix various typos
(This modifies UI, libobs, deps/obs-scripting, various cmake files)

Found using:
`codespell -q 3 -S *.ini,./UI/data/locale,./deps/w32-pthreads -L aci,dur,iff,mut,numer,uint`
2019-10-14 17:19:38 -07:00
Jim
c52f2cae53
Merge pull request #2070 from fzwoch/gcc9
cmake: no -Werror-implicit-function-declaration for C++
2019-10-14 15:21:00 -07:00
Jim
6b08c064f6
Merge pull request #2066 from jpark37/feature-level-baseline
Use D3D_FEATURE_LEVEL_10_0 as baseline
2019-10-12 20:55:33 -07:00
Jim
09c7ec487b
Merge pull request #2064 from jpark37/bgra-swap-chain
D3D swap chain enhancements
2019-10-12 20:54:33 -07:00
Jim
b327bf5deb
Merge pull request #2053 from Palakis/feature/frontend-api-transition-duration-changed
Frontend API: provide a "transition duration changed" event
2019-10-12 17:34:09 -07:00
Jim
b910edd872
Merge pull request #2058 from Palakis/duplicate-scene-names
UI: set names on scenes duplicated for Studio Mode
2019-10-12 16:42:04 -07:00
Jim
0f541aa285
Merge pull request #2054 from jpark37/opengl-version
libobs-opengl: Require OpenGL 3.3 instead of 3.2
2019-10-12 16:40:18 -07:00
Stéphane Lepin
881e49ce62 UI: frontend api "trans. duration changed" event 2019-10-12 16:29:44 -07:00
Colin Edwards
7e5ba1bde8
Merge pull request #2120 from jpark37/objc-msgsend
libobs: Strict objc_msgSend support
2019-10-12 12:16:17 -05:00
Jim
0a2fa768d5
Merge pull request #2045 from wolf247/master
rtmp-services: Add ChathostessModels
2019-10-12 02:17:32 -07:00
jp9000
d88a5a5a60 obs-browser: Remove "monitor by default" flag
The reasoning behind removing this flag is because the whole point of
having it in was so we could replace chromium's audio output.  But there
are too many obstacles in our path from doing that for now, so it's
better to not have this flag because it just causes a lot of browser
sources to initialize audio monitoring unnecessarily.  We can change
this in the future, but for now, it's best to let the user choose to
turn on audio monitoring for the source if they choose to turn on audio
rerouting to OBS.

Note that this only changes default behavior for newly created sources;
it will not change settings of existing sources the user had before this
change.
2019-10-11 23:42:35 -07:00
jp9000
d6f9ff0406 Revert "libobs/audio-monitoring: Don't init until used"
This reverts commit 22aa66a6eb.

Apparently, starting audio on the fly like this can introduce latency in
to the audio playback, so for now revert it.  It was a bit of a
precautionary thing rather than an actual fix anyway, so it probably
wasn't all that necessary to begin with.
2019-10-11 23:34:27 -07:00
jpark37
3130d38c9b libobs: Strict objc_msgSend support
Something changed that makes strict the default. Fixed up the code.
2019-10-11 22:17:23 -07:00
jp9000
dd48a99f03 libobs-d3d11: Fix code styling 2019-10-11 17:40:50 -07:00
jp9000
236ac66121 libobs: Update version to 24.0.3 2019-10-11 17:33:13 -07:00
jp9000
0f75f963ad libobs-d3d11: Fix calling convention of loaded func
Because this did not have WINAPI (stdcall) specified as the calling
convention on the gdi32 export, caused a crash due to stack corruption
on the 32bit version of OBS.
2019-10-11 17:21:11 -07:00
wolf247
7d6d315533 rtmp-services: Add ChathostessModels 2019-10-11 17:05:25 -07:00
Jim
76fe77831d
Merge pull request #2037 from cg2121/compiler-warnings
UI, libobs: Fix compiler warnings
2019-10-11 16:38:48 -07:00
jp9000
80a1fee70f obs-browser: Only disable NetworkService on macOS
Apparently, using the old chromium network implementation changes the
way cookies are handled, causing cookies to reset.  So instead of doing
that, continue to use the new network implementation on Windows, and
only use the old network implementation on macOS for the time being.
2019-10-11 12:45:42 -07:00
Jim
29ca28418f
Merge pull request #2115 from jpark37/duplicator-ref-count
Fix duplicator ref count
2019-10-10 21:01:16 -07:00
jpark37
471d752d75 libobs-d3d11: Use unordered_map for duplicator collection
Not in love with STL, but lets at least use the semantically-correct
collection. It's also a shame this is a global variable with gross
pre-main allocations, but attaching it to the device instance would
break the interface.
2019-10-10 19:29:15 -07:00
Jim
9fa1ec3ae9
Merge pull request #2114 from cg2121/fix-multiview
UI: Fix issue where multiview doesn't update
2019-10-10 19:15:07 -07:00
jpark37
1ce61c57c0 win-capture: Fix extra duplicator refs
Make duplicator_capture_tick the sole creater, and reference adder of
IDXGIOutputDuplication objects. This prevents a situation where
duplicator_capture::showing cause be false while
duplicator_capture::duplicator was not null at startup on background
scenes, preventing IDXGIOutputDuplication from being recreated when
DXGI_ERROR_ACCESS_LOST.
2019-10-10 19:03:18 -07:00
Clayton Groeneveld
016d4ee87f UI: Fix issue where multiview doesn't update 2019-10-10 20:12:20 -05:00
jp9000
c43b273f62 libobs: Update version to 24.0.2 2019-10-10 16:19:45 -07:00
Colin Edwards
730fafc72d
Merge pull request #2113 from cg2121/exclude-dir
Exclude build dir from clang format
2019-10-10 10:06:27 -05:00
jp9000
b7d094a532 libobs-d3d11: Don't set GPU priority on Intel adapters 2019-10-10 03:03:38 -07:00
jp9000
254947eaa0 libobs/audio-monitoring: Add error logging
Helps diagnose issues if the user is unable to initialize audio
monitoring for whatever reason.
2019-10-10 02:04:59 -07:00
jp9000
22aa66a6eb libobs/audio-monitoring: Don't init until used
This prevents audio monitoring from actually initializing unless audio
is actually played back through the source.  This prevents many browser
sources from initializing audio monitoring all at once needlessly if
audio is not being rerouted to OBS.
2019-10-10 02:04:58 -07:00
jp9000
8743b00f84 obs-browser: Use older chromium network implementation
This uses the older network implementation rather than the new
NetworkService chromium has implemented until a later version of CEF is
used.  The newer NetworkService implementation has caused some lag with
playback when hardware acceleration is not available for whatever
reason.  This doesn't fix media playback issues with software rendering
on windows, but it does on macOS.  All playback issues with software
rendering appear to be fixed in later version of CEF, however those
versions do not currently have hardware accelerated OSR or audio capture
support, so we must deal with 3770 until we can upgrade CEF again (which
hopefully won't be too long).
2019-10-10 02:00:57 -07:00
jp9000
ec769ef008 libobs-d3d11: Set maximum GPU priority
(This commit also modifies the UI)

This solves the issue where OBS would be deprioritized by Windows over
fullscreen games, causing OBS to lag out whereas the games would still
run fine.
2019-10-10 00:51:47 -07:00
Clayton Groeneveld
53f58ecd45 Exclude build dir from clang format 2019-10-10 01:38:40 -05:00
Clayton Groeneveld
a55f83a38f UI, libobs: Fix compiler warnings 2019-10-10 00:25:54 -05:00
jp9000
cda7f3e3fd Revert "UI: Remove FFZ from twitch integration"
This reverts commit c22d539a7b.
2019-10-07 18:24:38 -07:00
jp9000
c22d539a7b UI: Remove FFZ from twitch integration
Unfortunately, due to some conflicts between FFZ and BTTV (particularly
the fact that having FFZ enabled removes the BTTV settings menu items),
one of them needs to be removed.  For the time being, we'll remove FFZ,
because BTTV shows FFZ emojis anyway.
2019-10-07 13:36:56 -07:00
Jim
e582a60899
Merge pull request #2098 from jpark37/disable-warp-nv12
libobs-d3d11: Disable NV12 format support for WARP
2019-10-07 00:12:26 -07:00
jpark37
84d0fdc576 libobs-d3d11: Disable NV12 format support for WARP
Speculative fix. Don't have easy ability to reproduce this locally.
2019-10-06 20:30:49 -07:00
jp9000
89586ef441 obs-ffmpeg: Remove unbuffered mode from media source
Unbuffered mode is causing the frames of media sources to potentially
have some slight jitter in playback, so instead of using unbuffered mode
with media sources, just leave buffering on.  There may be a frame or so
of latency, but it shouldn't be noticeable to most users.
2019-10-05 15:40:12 -07:00
jp9000
e023060afa obs-transitions: Fix stingers sometimes getting cut off
The file duration is a bit of an estimate.  This adds 500ms to the
estimated stinger media file duration to help ensure stinger videos
play back in full without getting cut off prematurely.
2019-10-05 12:51:01 -07:00
jp9000
c6f48b9107 obs-browser: Update version to 2.7.12 2019-10-05 02:16:27 -07:00
jp9000
eabebd1774 obs-ffmpeg: Fix deadlock with nvenc lookahead
Lookahead requires examining frame data over a large number of frames,
so when pkv added the change to fully reset the encoder when the bitrate
changes, nvenc will invalidate all buffers and basically starts over
from a completely clean slate.

It's possible to make lookahead work when changing the bitrate, but due
to how lookahead seems to works internally in nvenc, it will cause
continually increasing latency every time the bitrate is updated, which
is unideal.

Additionally, when lookahead is enabled, deadlocks can occur when
changing the bitrate in a thread other than the graphics thread.
Currently we allow it to be reset outside of the graphics thread.  From
limited investigating, it would appear this deadlock occurs because
nvenc is locking and releasing old textures.

So instead of dealing with all these potential issues, disable the
ability to adjust bitrate when the user has lookahead enabled on nvenc.
It's not really worth implementing dynamic bitrate support when
lookahead is enabled if the latency is just going to continually
increase for every bitrate adjustment anyway.
2019-10-04 04:39:15 -07:00
Jim
50c9e99b43
Merge pull request #2087 from notr1ch/diskspace-check-fix
UI: Fix path calculation for disk space check
2019-10-02 13:12:19 -07:00
jp9000
6929c6a9f1 Revert "Revert "UI: Stop recording when disk space is low""
This reverts commit 8a48a1ba8e.

I have regrets.
2019-10-02 13:10:29 -07:00
jp9000
8a48a1ba8e Revert "UI: Stop recording when disk space is low"
This reverts commit d9a4842604.

Some people have been reporting that this is being triggered despite
having plenty of disk space.  So revert this until this issue is
investigated in more detail.
2019-10-02 12:41:46 -07:00
Richard Stanway
27b7f45fd7 UI: Fix path calculation for disk space check
When using custom FFmpeg output mode, the check would instead use the
standard recording path which is no longer visible in the settings. This
commit also simplifies the checks by moving the duplicated code to a new
function.
2019-09-27 15:04:07 +02:00
jp9000
66967b7a55 obs-ffmpeg: Do not enable hardware decoding by default
If a user has a tremendous amount of media files, this can cause
instability.  Instead, make hardware decoding something the user has to
explicitly enable.

Although hardware decoding was technically enabled by default even
before we fixed it, fixing it was essentially a change to defaults for
users because it was just not even available before version 24.
2019-09-24 03:04:18 -07:00
jp9000
94570478b7 obs-browser: Fix a deadlock
This fixes a freeze that can occur if you try to destroy browser while
another browser is being created.  The CEF UI thread has to wait on a
window message to the main application UI thread, meanwhile the destroy
call in the main application UI thread is waiting on the CEF UI thread,
thus causes a deadlock.

Now that we have the SetParent(hwnd, nullptr) code that detaches the CEF
window from the Qt window, we no longer have to worry about
synchronously shutting down the browser, so instead of waiting for that
operation to finish, just allow it to occur asynchronously.
2019-09-20 08:14:16 -07:00
jp9000
54f4b67843 libobs: Update version to 24.0.1 2019-09-20 00:23:36 -07:00