Commit Graph
6791 Commits
Author SHA1 Message Date
Jim cff0d6800f Merge pull request #1938 from Dead133/master
rtmp-services: Update ingest list for Restream.io
2019-06-25 18:35:46 -07:00
Jim c558b81f34 Merge pull request #1936 from jpark37/empty-vao
libobs-opengl: Empty VAO
2019-06-25 18:34:29 -07:00
jp9000 841bac4981 clang-format: Remove redundant params 2019-06-25 15:52:33 -07:00
Dead133 e0c8aac485 rtmp-services: Update ingest list for Restream.io 2019-06-25 17:18:02 +03:00
jpark37 b8e5cf3a95 libobs-opengl: Empty VAO
Use an empty VAO for shaders that generate their own vertices.
2019-06-24 23:13:04 -05:00
Jim c938ea712b Merge pull request #1935 from obsproject/clang-format
Apply clang-format to the project
2019-06-24 19:41:51 -07:00
Richard Stanway 80e9bb4ec7 libobs-d3d11: Fix missing vertex buffer clear in NV12 check 2019-06-25 00:51:01 +02:00
jp9000 8c54b7f393 obs-ffmpeg: Move external headers to external dir
Prevents automatic formatting with clang-format
2019-06-23 23:54:26 -07:00
jp9000 f53df7da64 clang-format: Apply formatting
Code submissions have continually suffered from formatting
inconsistencies that constantly have to be addressed.  Using
clang-format simplifies this by making code formatting more consistent,
and allows automation of the code formatting so that maintainers can
focus more on the code itself instead of code formatting.
2019-06-23 23:49:10 -07:00
jp9000 53615ee10f clang-format: Add clang-format files 2019-06-23 01:53:56 -07:00
Jim 3180a07d7c Merge pull request #1911 from jpark37/full-screen-triangle
libobs: Full-screen triangle format conversions
2019-06-22 02:42:32 -07:00
James Park aa22b61e3e libobs: Full-screen triangle format conversions
The cache coherency of rasterization for full-screen passes is better
using an oversized triangle that is clipped rather than two triangles.
Traversal order of rasterization is GPU-specific, but will almost
certainly be better using an undivided primitive.

A smaller benefit is that quads along the diagonal are not evaluated
multiple times, but that's minor in comparison.

Redo format shaders to bypass vertex buffer, and input layout. Add
global shader bool "obs_glsl_compile" to make API-specific decisions,
i.e. handle upside-down UVs. gl_ortho is not needed for format
conversion because the vertex shader does not use ViewProj anymore.

This can be applied to more situations, but start small first.

Testbed full screen passes, Intel HD Graphics 530:
RGBA -> UYVX: 467 -> 439 us, ~6% savings
UYVX -> uv: 295 -> 239 us, ~19% savings
2019-06-18 22:29:07 -07:00
Jim 6a795d52ea Merge pull request #1894 from Rosuav/lock-unlock-event
libobs/UI: Implement an item_locked event
2019-06-18 20:31:26 -07:00
Jim ab70bff4b3 Merge pull request #1913 from jpark37/area-shader-optimization
libobs: Area-resampling shader optimizations
2019-06-17 20:40:25 -07:00
Jim 55740f6f2e Merge pull request #1920 from jpark37/vector-pop
libobs-d3d11: Clean up device_projection_pop
2019-06-17 19:32:18 -07:00
Jim 6b60b28e51 Merge pull request #1928 from cg2121/no-tracks-selected
UI: Use stream track if no tracks are selected
2019-06-17 17:27:15 -07:00
Clayton Groeneveld 493962330c UI: Use stream track if no tracks are selected 2019-06-17 17:52:30 -05:00
jp9000 74cd1da656 Revert "UI: Use theme colors setting for Projectors too"
This reverts commit 8a22889e3d.

After further usage, result is undesirable.  We don't need the theme
applied to projectors.
2019-06-16 17:43:55 -07:00
Jim fafda14963 Merge pull request #1906 from jpark37/bgr-three
libobs: linux-v412: obs-ffmpeg: Add packed BGR3 video support
2019-06-15 16:40:44 -07:00
Jim 914fffe137 Merge pull request #1889 from jpark37/warm-render-targets
libobs: Remove unnecessary frame pipelining
2019-06-15 16:13:03 -07:00
Chris Angelico 2fe641b8a4 libobs, UI: Implement item_locked event
Similar to item_visible, this event fires whenever a scene item is
locked or unlocked. This allows the UI and libobs to remain in sync
regarding scene elements' statuses.
2019-06-15 16:09:10 -07:00
Jim dd607b422f Merge pull request #1881 from jpark37/lowres-fair-sampling
libobs: Improve low-resolution bilinear sampling
2019-06-15 16:03:02 -07:00
jp9000 02e523c125 libobs: Update version to 23.2.1 23.2.1 2019-06-13 22:28:10 -07:00
jp9000 bcd59b670a obs-frontend-api: Add func to add custom docks 2019-06-13 21:12:49 -07:00
Jim 6a4f1d0c1d Merge pull request #1925 from jpark37/disable-source-convert-blend
libobs: Disable blending when converting sources
2019-06-13 14:18:19 -07:00
James Park e72eb39e47 libobs: Disable blending when converting sources
This fixes the issue where limited-range RGB sources were being
composited with dirty render targets.
2019-06-12 22:23:51 -07:00
jp9000 4d3414a1ce UI: Fix editor inheriting source list stylesheet
Fixes a bug where if the user gave a custom color to a source list item,
the edit box used with renaming the item would also have that
background color while editing the name, awkwardly.
2019-06-11 22:20:51 -07:00
jp9000 b5b11dbf47 UI: Fix bug with custom source list item color
If the user gave the source list item a custom color, the "background"
stylesheet value would apply to children of the item widget, causing the
lock/eye checkboxes to also have that background color added on top of
the chosen color.  This is fixed by explicitly settings the background
value to none on the lock/eye checkboxes.
2019-06-11 21:31:26 -07:00
jp9000 58ce89bbe9 UI: Fix tray icon showing up on startup even if off
Apparently certain versions of Qt have a bug where the tray icon's
internal "visible" variable is set to false despite the fact that it
still shows.  Calling show() first before calling hide() sets the
internal boolean value and fixes the issue with the hide call.
2019-06-11 20:22:24 -07:00
jp9000 d5708d656e libobs: Fix null pointer dereference 2019-06-11 16:26:09 -07:00
jp9000 0d4d7f617c libobs: Update version to 23.2.0 23.2.0 2019-06-10 22:10:21 -07:00
Gol-D-Ace 973bc481ce Update translations from Crowdin 2019-06-11 01:42:42 +02:00
James Park bbef13166b libobs-d3d11: Clean up device_projection_pop
Simplify STL usage as requested by function comment.
2019-06-08 09:52:20 -07:00
James Park 9f66b90d99 libobs: Area-resampling shader optimizations
Switch for loop to do/while because we know the condition is always
true for the first loop.

Replace int math with float math to play nicely with more GPUs.

Add variables imagesize/targetsize to avoid redundant reciprocals.

Intel GPA results: 1166 -> 836 us
2019-06-03 23:11:23 -07:00
jp9000 8cfe219abf UI: Make two-auth message a bit friendlier 2019-06-03 09:24:28 -07:00
jp9000 16edcd991a UI: Use better link for Twitch two-factor warning 2019-06-03 09:16:33 -07:00
jp9000 1f39259bc5 win-capture: Add discord to game capture blacklist 2019-06-01 20:07:39 -07:00
Jim 5f7be60947 Merge pull request #1907 from notr1ch/updater-updates
UI/updater: Various updates
2019-06-01 18:09:10 -07:00
Jim f14856a8d0 Merge pull request #1909 from SCG82/fix-settings-list
UI: Fix output icon size. Add padding to settings list items
2019-06-01 17:54:24 -07:00
Jim 9b545ebc22 Merge pull request #1912 from VodBox/transition-label-fix
UI: Fix transition A/B labels on macOS/Linux
2019-06-01 17:53:24 -07:00
VodBox d2bbe36e64 UI: Fix transition A/B labels on macOS/Linux
Previously, if the video size in OBS was too big, the labels would not
render on macOS/Linux due to the labels not fitting inside the texture
in the freetype plugin. This change makes it so that there is a maximum
size for the label, rather than being solely based on video size.

This change also makes the labels look centered on macOS/Linux, as
unlike the GDI plugin on Windows, the freetype plugin aligns the bottom
of the text with the bottom of the source.
2019-06-01 23:59:35 +00:00
jp9000 6272409c49 UI: Add two-factor authentication warning for Twitch
Twitch will now return a 403 HTTP error code if you attempt to query
your stream key when your Twitch account does not have two-factor
authentication enabled.  This handles it a bit better and displays an
appropriate error message for users so they know where to go to enable
it.
2019-05-31 21:00:48 -07:00
jp9000 3bd99797d9 UI: Add ability to use rich text in warning dialogs
Allows the ability to use things such as links in warning dialogs,
optionally.  Disabled by default.
2019-05-31 20:52:59 -07:00
SCG82 012f24099f UI: Fix output icon size. Add padding to settings list items 2019-05-31 18:51:34 -07:00
Richard Stanway 5a8cad0876 UI/updater: Update some text for clarity 2019-05-31 15:47:47 +02:00
Richard Stanway 02a5d3e5db UI/updater: Add marquee progress bar for existing file check
This can take a while on a hard drive since it hashes the entire OBS
installation, show a undetermined progress marquee to avoid users
thinking that the updater has frozen.
2019-05-31 15:46:06 +02:00
Richard Stanway 5048fe2026 UI/updater: Add manifest file for DPI awareness 2019-05-31 15:39:51 +02:00
James Park 614025742b libobs: linux-v412: obs-ffmpeg: Add packed BGR3 video support
Someone mentioned this format preserves the most quality for a
particular capture card using V4L2.
2019-05-30 06:05:53 -07:00
Jim 21ce267ad4 Merge pull request #1896 from SCG82/cef-10.11
CI: Build CEF with OS X 10.11 target
2019-05-29 05:01:25 -07:00
Jim c4807ffef5 Merge pull request #1895 from SCG82/fix-travis
CI: Fix travis test on OSX
2019-05-29 05:00:42 -07:00