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

6497 Commits

Author SHA1 Message Date
James Park
d91bd327d7 libobs: libobs-d3d11: obs-filters: No excess alpha
Currently SrcBlendAlpha and DestBlendAlpha are both ONE, and can
combine together to form two. This is not a noticeable problem for
UNORM targets because the channels are clamped, but it will likely
become a problem if FLOAT targets are more widely used.

This change switches DestBlendAlpha to INVSRCALPHA, and starts
backgrounds as opaque black instead of transparent black. The blending
behavior of stacked transparents is preserved without overflowing the
alpha channel.
2019-04-07 18:16:56 -07:00
Jim
a0ead6f974
Merge pull request #1800 from cg2121/add-pragma-once
UI, libobs, text-freetype2: Add missing pragma once in header files
2019-04-06 23:40:43 -07:00
Jim
34a06caf50
Merge pull request #1805 from sputnick1124/frontend-api-access-systray
obs-frontend-api: Access system tray icon from API
2019-04-06 23:35:46 -07:00
Jim
411b6f1064
Merge pull request #1809 from cg2121/do-not-update-stats-hidden
UI: Don't update stats dock if hidden
2019-04-06 17:19:10 -07:00
Jim
a345b50966
Merge pull request #1807 from SuslikV/patch-14
UI: Fix incorrect padding usage in Rachni theme
2019-04-06 16:44:11 -07:00
Clayton Groeneveld
51198058c8 UI: Don't update stats dock if hidden
When the stats dock is hidden, the QTimer is still updating it, causing
unnecessary CPU usage.
2019-04-06 16:40:02 -07:00
Jim
10e5e4cafa
Merge pull request #1810 from derrod/bwtest-fix
UI: Fix bandwidth test flag being saved to stream key
2019-04-06 16:13:45 -07:00
derrod
4a55dedadc UI: Fix bandwidth test flag being saved to stream key
Previously enabling and disabling bandwidth testing in a certain order
lead to the parameter being included in the stream key that is saved to
disk, making it impossible to disable the bandwidth test later on.

By doing this properly and using string concatenation instead of
modifying (appending to) the key_ value this will no longer happen.
2019-04-06 15:35:16 +02:00
jp9000
6550c0dfaa obs-ffmpeg: Remove "A" variants from NVENC blacklist 2019-04-05 07:36:13 -07:00
Jim
9eb01a1229
Merge pull request #1808 from jpark37/area-filter-gl-flip
libobs: Fix and simplify Area scale filter
2019-04-04 18:19:02 -07:00
James Park
c4819678c9 libobs: Fix and simplify Area scale filter
It appears there's a projection flip that is applied in some situations,
like the preview pane in studio mode, and the shader math fails when
it's active causing the output color to be zero. This fixes the math for
GLSL (with a tiny redundancy penalty to HLSL), and cleans up some
unnecessary code along the way.

Use abs() to avoid zero area in case the OpenGL projection flip is
active. Also simplify the math, and remove the unnecessary sampler
state.
2019-04-04 08:39:54 -07:00
Gol-D-Ace
e78ac5ebef Update translations from Crowdin 2019-04-04 16:19:51 +02:00
jp9000
7ef4e10c89 libobs: Update version to 23.1.0 2019-04-04 06:46:51 -07:00
Nick Stockton
54da8eca85 obs-frontend-api: Access system tray icon from API
All UI elements are accessible through the obs frontend api via
obs_frontend_api_get_main_window, except for the tray icon and its
elements. This commit adds an obs_frontend_api_get_system_tray function
which returns the pointer to the QSystemTrayIcon cast to void (much like
the QMainWindow pointer for the main window).
2019-04-04 07:55:19 -04:00
SuslikV
2990a83c09
UI: Fix incorrect padding usage in Rachni theme 2019-04-04 09:59:03 +02:00
jp9000
739072fdcb UI: Do not show [x] (close) for primary dock widgets
This solves the issue of users who close the primary dock widgets and
can't figure out how to get them back, who for whatever reason choose
not to read the message box when closing dock widgets that tells them
how to get it back.  The users can still hide the primary dock widgets
via the View menu, but they can no longer close them via the [x] button
on the dock widget.  This change does not apply to secondary dock
widgets, such as a chat window, stats, etc.

Closes obsproject/obs-studio#1804
2019-04-03 09:55:27 -07:00
Clayton Groeneveld
d1be93ae69 UI, libobs, text-freetype2: Add missing pragma once in header files 2019-04-01 02:48:28 -05:00
Jim
98c86307aa
Merge pull request #1792 from WizardCM/restream-smaller
UI: Allow smaller Restream docks
2019-03-31 21:55:51 -07:00
Jim
2d442452b7
Merge pull request #1796 from cg2121/fix-hotkeys-not-showing
UI: Fix issue where space/esc hotkeys would be blank
2019-03-31 20:44:04 -07:00
Jim
7e634ee389
Merge pull request #1798 from cg2121/mantis-1418
UI: Fix file browser showing up when dir selected
2019-03-31 20:32:00 -07:00
Jim
62e2c955de
Merge pull request #1794 from cg2121/fix-ctrl-c-crash-linux
UI: Fix crash when using ctrl-c in Linux terminal
2019-03-31 18:50:39 -07:00
Clayton Groeneveld
659b58c8f3 UI: Fix file browser showing up when dir selected
Fixes: https://obsproject.com/mantis/view.php?id=1418
2019-03-31 06:36:13 -05:00
Clayton Groeneveld
e321005b02 UI: Fix issue where space/esc hotkeys would be blank
This also modifies libobs.

This only happened on Linux.

Fixes https://obsproject.com/mantis/view.php?id=1018
2019-03-31 05:10:02 -05:00
Clayton Groeneveld
cc1f239420 UI: Fix crash when using ctrl-c in Linux terminal
This fixes a seg fault that would happen when launching OBS from the
terminal and then hitting ctrl-c.
2019-03-31 00:59:51 -05:00
Matt Gajownik
69bbbe342a UI: Allow smaller Restream docks 2019-03-30 20:28:22 +11:00
jp9000
d18c62b2b5 libobs, image-source: Fix ABI break in image_file_t structure
In commit a776a6cf07, the image_file_t structure (which is a public
structure) had a member variable added to it, which broke ABI.
2019-03-28 22:30:20 -07:00
jp9000
eb672d7725 UI: Fix act. feed version hide check to <= 23.0.2 2019-03-28 16:45:24 -07:00
jp9000
b1f04a47cf libobs: Change internal version to 23.0.3 (temporarily)
While performing a release candidate, it is important to use an actual
version before the actual release candidate version so that the
auto-updater will know to update to 23.1.0
2019-03-28 16:44:07 -07:00
jp9000
5d83e1aec4 obs-ffmpeg: Show encoder name when logging jim-nvenc 2019-03-28 16:38:14 -07:00
jp9000
81354a9903 UI: Hide act. feed by default if prev ver below 23.1 2019-03-28 16:38:14 -07:00
Jim
a4f602b15a
Merge pull request #1784 from cg2121/remove-help-icon
UI: Remove help icon from source select dialog
2019-03-28 02:28:46 -07:00
Clayton Groeneveld
c1eefdca68 UI: Remove help icon from source select dialog
Fixes https://obsproject.com/mantis/view.php?id=1394
2019-03-28 03:55:25 -05:00
jp9000
29a1a97392 UI: Don't open settings or close in event subloop
Fixes a crash that can happen if you try to use the settings window
while in an even subloop, or if you try to close OBS while in an event
subloop.  Continually retries (defers) the actions every one second
until the subloop has finished.
2019-03-26 22:05:52 -07:00
jp9000
11c0d6e976 libobs: Update version to 23.1.0 2019-03-26 22:05:52 -07:00
Gol-D-Ace
2283e6742a CI: Add Restream secrets for AppVeyor 2019-03-27 02:23:23 +01:00
Jim
7066055cf3
Merge pull request #1761 from jpark37/gl-fixes
libobs: Fix invalid max_anisotropy value
2019-03-26 14:14:06 -07:00
Jim
faa2ba3617
Merge pull request #1776 from jpark37/unused-function
obs-filters: Remove unused function in shader
2019-03-26 14:08:02 -07:00
Jim
754c4d66c8
Merge pull request #1772 from jpark37/area-filter-glsl-fix
libobs: Fix Area scale filter for GLSL
2019-03-26 14:07:39 -07:00
Jim
02dad0b858
Merge pull request #1779 from jpark37/sharpness-cleanup
libobs: Remove dead code in sharpness effect
2019-03-26 14:06:41 -07:00
jp9000
c18aab29ee obs-ffmpeg: Fix blacklisted adapter check
The quadro P5000 would incorrectly be considered blacklisted because it
used a string search for the P500, which is an earlier quadro variant
that does not have NVENC support.

To fix this, instead of just doing a string search, additionally check
to make sure that there preceding or trailing numbers on the adapter
name.
2019-03-26 03:00:00 -07:00
SoftArch
de66aeab68 UI: Add Restream integration
Closes obsproject/obs-studio#1768
2019-03-25 19:13:27 -07:00
Richard Stanway
0bf09160e5 win-dshow: Update libdshowcapture for crash fix 2019-03-25 17:16:21 +01:00
James Park
36201d9b67 libobs: Remove dead code in sharpness effect
Not sure why, but there's a dead uniform and interpolant in the
sharpness effect. This change removes them.
2019-03-25 08:38:45 -07:00
James Park
f046177c4f obs-filters: Remove unused function in shader
SampleYUVToRGB() is no longer used after the previous DrawMatrix purge.
2019-03-23 18:31:38 -07:00
James Park
746820e35a libobs: Fix Area scale filter for GLSL
Remove const qualifiers because they are syntax errors for GLSL when
used like in C.
2019-03-23 13:16:50 -07:00
Gol-D-Ace
a81b7a3e58 CI: Don't build service integration in PRs&Forks
Without this, Fork and PR builds will fail.
2019-03-23 19:24:04 +01:00
Gol-D-Ace
3e78e05c6e CI: Build service integration on Azure Pipelines 2019-03-23 14:35:29 +01:00
jp9000
3a288e95f4 obs-browser: Make DispatchJSEvent asynchronous 2019-03-22 05:29:08 -07:00
jp9000
70b8f0aa65 libobs: Fix ABI break
OBS_EFFECT_AREA from 7d811499e was inserted in the middle of the enum,
which breaks ABI for any binaries that use
OBS_EFFECT_PREMULTIPLIED_ALPHA or OBS_EFFECT_BILINEAR_LOWRES.
2019-03-22 03:46:42 -07:00
Jim
233c4a85d2
Merge pull request #1751 from cg2121/fix-repeating-images
image-source: Re-add fix of repeating images
2019-03-20 19:13:22 -07:00