0
0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 13:08:50 +02:00
Commit Graph

6704 Commits

Author SHA1 Message Date
VodBox
52235ba86d libobs: Add transition and showing counter functions
This commit adds a function to forcefully stop a transition, and to
increment/decrement the showing counter for a source with the MAIN_VIEW
type.

These functions are needed for the transition previews to work as
intended.
2019-05-12 21:13:21 -07:00
jp9000
64b6812d71 README.rst: Add contributing/donating link
Closes obsproject/obs-studio#1639
2019-05-12 15:33:53 -07:00
Jim
3d6cdf05d3
Merge pull request #1789 from remjey/vaapi-fix-cbr
Fix VAAPI CBR
2019-05-11 20:21:08 -07:00
Jérémy Farnaud
525c473c4c obs-ffmpeg: Fix VAAPI CBR 2019-05-11 17:20:24 -07:00
Jim
e4aca036ca
Merge pull request #1877 from jpark37/qt-on-graphics-thread
libobs: UI: Remove Qt usage from graphics thread
2019-05-10 01:15:09 -07:00
Jim
cac6897ad2
Merge pull request #1876 from jpark37/clang-warning-fix
libobs: Restore casts to fix Clang warnings
2019-05-09 23:34:53 -07:00
Jim
6f4718ee16
Merge pull request #1875 from jpark37/rtmp-mac-fix
obs-outputs: Fix undefined MSG_NOSIGNAL
2019-05-09 23:34:30 -07:00
James Park
5471e74cbe libobs: UI: Remove Qt usage from graphics thread
This fixes Xcode warning about detecting UI usage from another thread.
2019-05-09 23:30:37 -07:00
James Park
2ff9cf17c0 obs-outputs: Fix undefined MSG_NOSIGNAL
Define MSG_NOSIGNAL even if CRYPTO is not defined.
2019-05-09 22:38:34 -07:00
James Park
f03b4dc965 libobs: Restore casts to fix Clang warnings
Clang doesn't like it if you convert T** to const T* const* without
casting even though it should be safe. Might be a C language thing.
2019-05-09 21:59:38 -07:00
Jim
e9185f462a
Merge pull request #1874 from tmatth/bugfix/avoid-sigpipe-on-closed-sock
Avoid sigpipe on writing to closed file descriptors
2019-05-09 19:26:01 -07:00
Jim
3a3cfce29d
Merge pull request #1873 from Palakis/feature/frontend-api-studio-mode-transition
obs-frontend-api: Add method to trigger a Studio Mode transition
2019-05-09 19:24:59 -07:00
Jim
ce0d3f106e
Merge pull request #1785 from brittneysclark/fix_qsv_crash
obs-qsv: Fix QSV failing with new DCH drivers
2019-05-09 19:24:30 -07:00
Jim
abe8702d4a
Merge pull request #1872 from Palakis/feature/frontend-api-transition-duration
obs-frontend-api: Add methods to get/set transition duration
2019-05-09 17:34:07 -07:00
brittneysclark
092c35b2d7 obs-qsv: Update libmfx, fix QSV with new DCH drivers
This patch fixes QSV failing with new DCH graphics drivers. QSV is not
initializing under certain conditions when the graphics adapter 0 is not
set to iGFX due to outdated MSDK dispatcher. Updating to MSDK with new
dispatcher to enable proper initialization of QSV encoder with DCH
drivers.
2019-05-09 17:31:35 -07:00
Tristan Matthews
4bb002c4d3 UI: Block SIGPIPE in all threads
This can happen when trying to write to a closed socket (in the case
of an RTMP server closing the connection).
2019-05-09 17:06:17 -07:00
Tristan Matthews
94c881b891 obs-outputs: Return error instead emitting SIGPIPE
This could happen if writing to a socket which was closed by the peer.
2019-05-09 17:05:38 -07:00
Stéphane L
4762351258 obs-frontend-api: Add func to trigger a Studio Mode transition 2019-05-09 17:01:08 -07:00
Stéphane L
d3910149d2 obs-frontend-api: Add methods to get/set transition duration 2019-05-09 16:58:47 -07:00
Jim
4991113abc
Merge pull request #1852 from jpark37/blend-alpha-attempt-two
libobs: libobs-d3d11: Fix alpha blend
2019-05-08 23:37:10 -07:00
James Park
ba21fb947e libobs: Fix various alpha issues
There are cases where alpha is multiplied unnecessarily. This change
attempts to use premultiplied alpha blending for composition.

To keep this change simple, The filter chain will continue to use
straight alpha. Otherwise, every source would need to modified to output
premultiplied, and every filter modified for premultiplied input.

"DrawAlphaDivide" shader techniques have been added to convert from
premultiplied alpha to straight alpha for final output. "DrawMatrix"
techniques ignore alpha, so they do not appear to need changing.

One remaining issue is that scale effects are set up here to use the
same shader logic for both scale filters (straight alpha - incorrectly),
and output composition (premultiplied alpha - correctly). A fix could be
made to add additional shaders for straight alpha, but the "real" fix
may be to eliminate the straight alpha path at some point.

For graphics, SrcBlendAlpha and DestBlendAlpha were both ONE, and could
combine together to form alpha values greater than one. This is not as
noticeable of a problem for UNORM targets because the channels are
clamped, but it will likely become a problem in more situations if FLOAT
targets are used.

This change switches DestBlendAlpha to INVSRCALPHA. The blending
behavior of stacked transparents is preserved without overflowing the
alpha channel.

obs-transitions: Use premultiplied alpha blend, and simplify shaders
because both inputs and outputs use premultiplied alpha now.

Fixes https://obsproject.com/mantis/view.php?id=1108
2019-05-08 20:26:52 -07:00
Jim
c396a30de7
Merge pull request #1819 from Xaymar/patch-add-effect-debug-info
libobs: Add additional effect debugging information
2019-05-08 17:56:07 -07:00
Jim
60f79eb4b9
Merge pull request #1854 from cg2121/audio-stuff
UI: Use dB for volume in adv. audio properties
2019-05-08 17:18:21 -07:00
Clayton Groeneveld
214d482ab1 UI: Change fader type to log 2019-05-08 16:41:18 -07:00
Clayton Groeneveld
c46fe33710 UI: Make volume faders more precise 2019-05-08 16:41:17 -07:00
Clayton Groeneveld
03c9d930da UI: Change volume to dB in adv audio properties 2019-05-08 16:41:17 -07:00
jp9000
528daad181 UI: Use escaped html for about dialog 2019-05-06 07:43:48 -07:00
jp9000
acc8419295 UI: Add Patreon contributors to About dialog 2019-05-05 20:00:26 -07:00
Jim
ce3abe52bf
Merge pull request #1870 from sorayuki/patch-1
win-dshow: fix issue decoding some H.264 stream
2019-05-05 11:46:10 -07:00
sorayuki
f67e63b1c6
win-dshow: fix issue decoding some H.264 stream
Logitech C920 web camera will output YUVJ420P which is not supported yet.
2019-05-05 16:18:16 +08:00
Jim
b5c20fb924
Merge pull request #1869 from cg2121/fix-systray
UI: Fix system tray not working
2019-05-04 08:28:07 -07:00
Jim
a2cf97bfd4
Merge pull request #1868 from SuslikV/patch-8
UI: Hide Alpha channel field from the color picker
2019-05-04 07:52:20 -07:00
Clayton Groeneveld
37bde71020 UI: Fix system tray not working 2019-05-04 09:23:21 -05:00
SuslikV
7bbd45f8d0
UI: Hide Alpha channel field from the color picker
Do not allow the user to select the alpha component of a color.
2019-05-04 16:55:31 +03:00
Jim
131cfaf4f8
Merge pull request #1867 from tmatth/bugfix/tray-crash
UI: fix crash due to NULL dereference
2019-05-03 08:26:57 -07:00
Jim
01b7af2702
Merge pull request #1864 from jpark37/bad-types
libobs: Fix crashes from wrong types
2019-05-03 01:40:08 -07:00
Tristan Matthews
92853f2c7b UI: fix crash due to NULL dereference 2019-05-03 02:54:55 -04:00
Jim
a1caf87ec7
Merge pull request #1855 from h-o-sein/master
rtmp-services: Update GameTips.TV
2019-05-02 19:40:31 -07:00
Hosein
61acbe9328 rtmp-services: Update GameTips.tv 2019-05-02 19:38:47 -07:00
James Park
4afdf70fd5 libobs: Fix crashes from wrong types 2019-05-02 19:09:34 -07:00
Colin Edwards
4efb80de5f
Merge pull request #1863 from DDRBoxman/swig
CI: Use swig 3.0.12 on OSX
2019-05-02 16:58:38 -07:00
Colin Edwards
f5c6fa3656 CI: Use swig 3.0.12 on OSX 2019-05-02 18:39:59 -05:00
jp9000
6b2f3d0604 UI: Fix theme showing incorrect theme when on Dark 2019-05-02 15:47:35 -07:00
Colin Edwards
0ee9d191bf
Merge pull request #1862 from DDRBoxman/swig
CI: Use swig 3.04 on OSX
2019-05-02 13:28:07 -07:00
Colin Edwards
f5becb64da CI: Use swig 3.04 on OSX 2019-05-02 15:07:03 -05:00
jp9000
3f3ec4f933 obs-ffmpeg: Fix jim-nvenc initial DTS for fractional FPS
The initial DTS for non-fractional framerates was being incorrectly
calculated.  It assumed that the time base was in frames when it was
not.

Closes obsproject/obs-studio#1857
2019-05-02 12:45:17 -07:00
Jim
3881f9de27
Merge pull request #1859 from cg2121/remove-settings-lines
UI: Various visual improvements
2019-05-02 11:22:26 -07:00
Clayton Groeneveld
31b73f8025 UI: Add ability to set properties spinbox suffix 2019-05-02 08:54:14 -07:00
Clayton Groeneveld
8789b3469b libobs: Add ability to set spinbox property suffix 2019-05-02 08:54:14 -07:00
Clayton Groeneveld
b2e0d93990 UI: Use icons for hotkey buttons 2019-05-02 08:54:13 -07:00