f8ee95d71c
obs-*: Cleanup
2020-02-13 05:09:14 +01:00
5956a6f7a9
ffmpeg-encoder/nvenc: Add AUD and DPB Size options
2020-01-15 13:43:33 +01:00
98c7a2e379
ffmpeg-encoder/nvenc: Fix typo
2020-01-15 05:53:54 +01:00
34b2859dac
ffmpeg-encoder/nvenc: Add minimum bitrate, fix target quality and more
...
Adds support for specifying Minimum Bitrate directly in the UI instead of requiring custom settings to do so. Additionally Adaptive I/B-Frames are now only shown if Look-Ahead is a value greater than 0 frames.
Quality Minimum can also now be left at a default value of -1, the Quality group is no longer toggleable and Quality Target moved into the group. Settings options on the context is now searching children too (if there are any).
Finally, some C++17 formatting was done.
Fixes #101
2020-01-15 05:50:31 +01:00
5d5a104819
ffmpeg-encoder: Improve UI, fix acceleration encode, etc
2020-01-15 03:59:03 +01:00
96ac0bd11b
ffmpeg-encoder: Fix weird bug with std::map crashing in constructor
2020-01-14 10:36:04 +01:00
109b1c9b0f
ffmpeg-encoder: Fix incorrect call
2020-01-14 10:03:42 +01:00
a72eba6ded
ci: Remove Node.JS requirement
2020-01-14 09:31:41 +01:00
8df90dfda8
ffmpeg-encoder: Fix handler detection
2020-01-14 02:15:05 +01:00
14d05ccdac
plugin: Enable FFmpeg Encoders
2020-01-14 01:55:31 +01:00
b306cebd6b
project: More warnings fixed
2020-01-14 01:39:13 +01:00
ebc50dcefe
utility: Merge util-math and util-memory
2020-01-14 01:11:08 +01:00
1987bfb853
ffmpeg-encoder: Fix some warnings
2020-01-14 01:04:49 +01:00
a33dd83d72
project: Merged FFmpeg Encoders Step 3
2020-01-13 23:40:08 +01:00
0a16ce07dc
project: Merged FFmpeg Encoders Step 2
2020-01-13 22:40:15 +01:00
3eea289679
project: Merged FFmpeg Encoders Step 1
2020-01-13 01:52:30 +01:00
3062d3b331
gfx-shader: Better logging, and ViewSize parameter
2020-01-01 04:21:02 +01:00
3e02857d39
gfx-shader-param: Initialize all variables
2020-01-01 02:59:02 +01:00
26a58645a7
gfx-shader-param-basic: Support for scaling and fix enumerations
...
Scaling is now fully supported for Floats and Integers, which allows much higher precision inputs, or upscaling to a different range. Complex functions for scaling are not supported as those would be a scripting thing and should be kept as that (OBS Studio has built in Lua scripting).
Additionally, enumerations are now correctly loaded with data.
Related #5
2020-01-01 02:58:45 +01:00
ce15bc6abc
gfx-shader-param: Fix is_visible
2019-12-25 20:10:09 +01:00
f79502b9b0
gfx-shader: Deal with remaining compile errors
2019-12-25 19:18:44 +01:00
731a22e1ea
gfx-shader-param-basic: Automatically resize min/max/step/scale buffers
2019-12-25 19:10:56 +01:00
975d2e293e
gfx-shader-param-basic: Add Integers, Enumerations, Arrays
2019-12-25 19:10:01 +01:00
903d416607
gfx-shader-param: Fix get_parameter
2019-12-25 19:09:30 +01:00
17ee2d713c
gs-effect-parameter: Implement copy and move
2019-12-25 19:09:13 +01:00
1902d005e9
gfx-shader-param: Add support for automatic parameters
...
Allows other parameters to be a seed to these parameters.
2019-12-25 10:14:04 +01:00
907216f143
gfx-shader: Don't show parameters that are invisible
2019-12-25 10:10:06 +01:00
4acbfedd40
gfx-shader-param: Support for input, slider, enum and more
2019-12-25 10:09:56 +01:00
777556f4f6
gfx-shader-param: Vastly improve parameter functionality
...
Allow for overriding type and size of an element, opening the path for `int#[]`, `float#[]`, `int#x#`, `float#x#`, `bool#x#`, `vector<type, #>` and `matrix<type, #, #>`. Also allows for specifying the exact type of texture instead of hoping the user gets it right, as well as samplers.
Parameters are also now created if they are invisible, which means that the properties() function must not be called, but they must still be used like any other. This is due to a problem with default values not being applied all the time, and sometimes just vanishing.
The code also now throws exceptions with reasonable text, which should be caught by the gfx::shader implementation and refuse a load of the effect. No other state should be modified at that point, so care must be taken that up until the moment the complete initialization is done no other state is modified.
2019-12-24 22:02:37 +01:00
eab3ae4fbc
gfx-shader-param: Add support for order and overall name/desc
2019-12-24 08:38:01 +01:00
9696f836e0
gfx-shader: Fix startup and select crash if file is missing
2019-12-24 08:37:37 +01:00
3018c9b9ea
project: Version 0.8.0a1
2019-12-22 08:31:00 +01:00
4c5a7018a3
gfx-shader: Add file watching and dynamic UI updates
...
Thanks to the workaround in obs::tools, gfx::shader::shader now supports dynamically rebuilding the properties with new properties without crashing OBS Studio. This effectively allows you to have an up to date view of the current parameters for the shader technique.
Additionally with file watching, live development of shaders is possible at very little cost. Currently only file times and size is looked at every 333ms, but in the future it is possible to also watch for file renames and more.
2019-12-22 06:14:26 +01:00
bd6b4f2d2a
gfx-shader-param-basic: Add support for defaults function
2019-12-22 06:07:54 +01:00
672c6d39af
gfx-shader-param: Split setting defaults from properties
2019-12-22 06:07:37 +01:00
1ff6c0cf41
obs-tools: Add work around for property memory corruption
...
The current implementation of obs_properties_remove_by_name corrupts the obs_properties_t object whenever it is called on the first or last property in the list. This leads to rapid unscheduled disassembly, and therefore must be fixed in order for this function to be used.
Fixed by upstream PR https://github.com/obsproject/obs-studio/pull/2257 .
2019-12-22 06:07:07 +01:00
9ef60cc2f9
gfx-shader: Add support for validating file differences
...
Removes the stutter when re-opening the properties dialog which was caused by recompiling the same exact shader every time this happened. Also paves the way for simple file watching.
2019-12-21 18:23:26 +01:00
2faa68f9be
gs-effect: Pass unmodified parameters as const reference
2019-12-21 18:20:36 +01:00
1d9a4ddbf5
gs-helper: Fix nonstandard usage of va_start
2019-12-21 18:07:08 +01:00
624bdda6a3
gs-texture: Reduce context lock time and improve code
2019-12-21 18:06:17 +01:00
aa59806322
gs-effect: Fix warning
2019-12-21 18:05:54 +01:00
e5fb68d2c1
utility: Add any and exact matching for enum class bitmasks
2019-12-21 18:05:32 +01:00
cbada3e438
obs-source: Deprecate obs::source due to stability issues
...
This should be replaced with a class inheriting from std::shared_ptr.
2019-12-21 17:43:12 +01:00
7e5cbe18cf
project: Apply clang-format
2019-12-21 17:05:53 +01:00
1f0c595a0a
obs-source-factory: Add missing include
2019-12-21 17:05:49 +01:00
d13778b017
gfx-shader: Fix some crash/problematic locations
2019-12-18 07:49:56 +01:00
24edee795a
gfx-shader-param: FIXME Don't create parameters for invisible
2019-12-18 07:49:43 +01:00
de473f0c2e
gfx-shader-param-basic: Fix incorrect float properties
2019-12-18 07:49:19 +01:00
b7f76f5e01
locale: New translatable strings
2019-12-18 06:39:08 +01:00
47dba25052
source-shader: Update to new gfx::shader::shader
2019-12-18 06:39:08 +01:00
e6220b18f6
project: Temporarily disable Custom Shader filters
2019-12-18 06:39:07 +01:00
f1b9a1a712
gfx-shader: Initial code
2019-12-18 06:39:07 +01:00
0a761b97a2
gfx-shader-param*: Initial code
2019-12-18 06:39:07 +01:00
f49f3a30b6
filter-displacement: Fix typo
2019-12-18 06:39:07 +01:00
3b66860a8f
gfx-blur-gaussian*: Update to new API
2019-12-18 06:39:07 +01:00
c0f131642b
gs-effect-parameter: Improve API and fix incorrect functions
2019-12-18 06:39:06 +01:00
cd82e2cac7
gs-effect-pass: Implement parameter getter and fix possible crash
2019-12-18 06:39:06 +01:00
570b70479f
gs-effect-technique: Fix possible crash
2019-12-18 06:39:06 +01:00
47dc948861
gfx-blur-gaussian: Remove left over obs_enter_graphics ( #83 )
...
This single line causes OBS to freeze in place, and is not needed as the Graphics Context is already locked by gs::context().
Fixes #83
2019-12-17 23:53:21 +01:00
16347beb87
filter-*, source-*: Fix rendering of filters and duplication of sources
2019-12-17 23:52:10 +01:00
1c7fd1495c
source-mirror: Fix potential lockup and rescaling with original size
...
Getting the resolution of a source is very expensive in libOBS, as libOBS does not cache it and instead always calls into the filters and sources to determine the actual source. This also leads to potential lockups due to the filter list mutex being locked for the target source.
Therefore instead of calling it multiple times, cache the result of the call, if that result is even necessary. This reduces the need to synchronize lightly parallelized work (UI and libOBS code) and helps against the potential race condition in libOBS.
2019-12-16 23:53:20 +01:00
01f23e17fe
gs-effect: Also override finalizer for the stored ptr
2019-12-16 23:07:49 +01:00
e7b46063aa
gs-effect: Fix typo from refactor
2019-12-16 22:53:25 +01:00
b54e95527a
gs-effect*: Finish up refactoring onto std::shared_ptr
...
This is most likely not the last refactor, the entire obs/gs stuff is very very basic right now and likely needs a complete rewrite.
2019-12-15 12:55:19 +01:00
11a2329519
gs-effect: Refactor onto std::shared_ptr
2019-12-15 11:13:47 +01:00
1f25b56579
gs-effect-technique: Return nullptr instead of throwing exception
2019-12-15 10:37:57 +01:00
ef76e353d3
gs-effect-pass/technique: Change to protected inheritance
...
Prevents the use of get() and reset() where not actually needed and forces us to actually implement all of the methods needed to interface with the object, leading to cleaner and safer code.
2019-12-15 10:37:41 +01:00
50ac6893bf
gs-effect-parameter: Refactor effect_parameter onto std::shared_ptr
...
Prevents problems further down the line and supports multiple types of parents to ensure that lifetime is guaranteed.
2019-12-15 10:35:29 +01:00
0ad896e905
gfx-shader: Rename from gfx-effect-source
2019-12-15 09:09:11 +01:00
738b08de36
gs-effect-pass/technique: Implement wrapper code based on std::shared_ptr
...
These two wrap the underlying gs_epass and gs_effect_technique objects, to allow direct and improved access to them without relying on the libobs API to provide this access for us. Additionally these make it safe for us to use them instead of relying on C-like code to deal with it.
2019-12-15 09:05:23 +01:00
d53e9eeadf
filter-sdf-effects: Restore compatibility with 24.0.3 and earlier
2019-12-14 21:33:32 +01:00
01895c1ccc
filter-dynamic-mask: Restore compatibility with 24.0.3 and earlier
2019-12-14 21:33:25 +01:00
af78c177ad
filter-displacement: Restore compatibility with 24.0.3 and earlier
2019-12-14 21:33:16 +01:00
a24e0d2c10
filter-blur: Restore compatibility with 24.0.3 and earlier
2019-12-14 21:33:06 +01:00
d8e1c7c779
filter-transform: Restore compatibility with 24.0.3 and earlier
2019-12-14 21:32:48 +01:00
b311d79e50
source-mirror: Remove OBS_SOURCE_CUSTOM_DRAW
2019-12-14 02:37:04 +01:00
66abaac67b
filter-color-grade: Refactor onto obs::source_factory
...
Related: #90
2019-12-14 02:34:48 +01:00
7e98df0d1c
obs-source-factory: Add helper functionality to make things easier to use
2019-12-14 02:34:48 +01:00
5be2941299
filter-sdf-effects: Move factory to bottom of the file
2019-12-03 20:38:34 +01:00
59878b62d0
filter-dynamic-mask: Fix nonstandard use of va_start
2019-12-03 20:38:14 +01:00
d9f43ec2e8
filter-blur: Refactor onto obs::source_factory
2019-12-03 20:37:57 +01:00
4e1dcb533c
filter-dynamic-mask: Rebase onto obs::source_factory
2019-12-03 20:11:27 +01:00
0e425ab48f
source-mirror: Fix missing input selection
2019-12-03 20:08:16 +01:00
efb6b0b9be
filter-transform: Further refactoring
2019-12-03 18:28:42 +01:00
48e17ad562
filter-sdf-effects: Refactor onto obs::source_factory
...
Also replaces the global effect objects with per-source ones
2019-12-03 17:47:39 +01:00
df8ebd94ea
filter-displacement: Refactor onto obs::source_factory
...
This drastically improves stability and prevents all exceptions from leaking into libobs C code, which prevents crashes and unexpected freezes from exception handlers further down the stack.
Additionally minor work was done to further improve the quality and user experience for the filter.
2019-11-18 03:03:11 +01:00
6efdb1950b
obs-source-factory: Fix typo and missing return
2019-11-18 03:03:11 +01:00
db85883821
obs/obs-source-factory: Fix potential null-pointer-dereference
2019-11-17 14:07:54 +01:00
87f83738c3
gs-helper: Add common debug colors
2019-10-31 05:59:16 +01:00
10681d30c8
gs-helper: Remove unused constructor
2019-10-18 23:04:23 +02:00
90cdc30ef1
gs-helper: Add class for managed debug markers
2019-10-18 22:59:30 +02:00
9b0ea98243
filter-transform: Add GPU debug markers
2019-10-18 22:42:07 +02:00
ba71b43a39
gfx-source-texture: Add debug markers
2019-10-18 22:32:54 +02:00
141a5efd00
filter-transform: Refactor onto obs::source_factory
2019-10-18 22:32:54 +02:00
bacf52f9b6
source-mirror: Refactor to improve performance
...
Caching the output of a source is only necessary for really expensive to render sources, so it is disabled by default now. Thanks to that, most Source Mirrors are now "free" instead of requiring two context switches and a texture, while those really expensive can be manually set to cache.
The scaling mode is also set to disabled instead of point when rescaling is off to further improve performance. The previous method would incorrectly cause an extra texture to be used.
Additionally we now have support for debug markers for graphics debugging, allowing us to exactly tell apart improvements in rendering cost for this source.
2019-10-18 22:32:54 +02:00
52c9e372ba
source-mirror: Refactor onto obs::source_factory
2019-10-18 22:31:53 +02:00
d47ab0570f
obs-source-factory: Barebone Source Factory and Instance
...
This class and template should be used to reduce the code clutter from repeatedly doing the same thing. It requires OBS v24.0 or newer since the get_properties2 and get_defaults2 API were fully implemented with it.
2019-10-18 22:31:52 +02:00
6db575c9cf
source-mirror: Add debug markers
2019-10-16 04:54:40 +02:00
03c2a68846
gfx-effect-source: Catch exceptions as const
2019-10-13 07:28:59 +02:00
e832dbd628
filter-sdf-effects: Fix and improve various problematic locations
2019-10-13 07:28:29 +02:00
4fe76a85ae
filter-blur: Fix some warnings
2019-10-13 07:28:12 +02:00
bbcbd0fa1e
filter-color-grade: Fix and improve various problematic locations
2019-10-13 07:27:59 +02:00
e07d7c01fc
filter-displacement: Fix and improve various problematic locations
2019-10-13 07:27:42 +02:00
ef5e6ac896
filter-dynamic-mask: Catch const exceptions
2019-10-13 07:08:56 +02:00
06d9a3d2f5
filter-transform: Catch and log exceptions
2019-10-13 07:08:02 +02:00
96466100b4
obs-source: Ensure that exceptions are const
2019-10-13 07:07:31 +02:00
b5d3131203
filter-dynamic-mask: Fix some crashy locations
2019-10-13 07:02:04 +02:00
0ef94aad0f
gs-vertexbuffer: Fix and improve various problematic locations
2019-10-13 06:38:15 +02:00
45d2431ef5
source-mirror: Fix and improve various problematic locations
2019-10-13 06:20:41 +02:00
fd0b79e97d
utility-event: Remove unused event handler
2019-10-13 05:58:53 +02:00
f1a376d44b
cmake: Add commit to version.hpp template
...
Switches out the `const uint16_t` for actual defines, which are easier to deal with and work in C out of the box.
2019-10-13 05:54:20 +02:00
e02225262c
obs-source: Add noexcept try-catch to C facing callbacks
2019-09-07 21:35:32 +02:00
d6f1979dee
project: Fix missing returns
2019-09-07 21:28:54 +02:00
5a4d38d249
project: Fix a massive list of dangerous warnings
...
This is a massive improvement to stability and safety when using the plugin, as all exceptions should now no longer be leaked into C controlled code, which can't actually handle exceptions at all.
Warnings fixed:
* Potentially throwing exception during library load.
* Possibly throwing function passed to C.
* Statement does nothing.
* Variable is initialized but not referenced.
* Variable overloads variable in parent scope.
2019-09-05 18:42:28 +02:00
2a4a3bf501
util-memory: Cast to intptr_t
2019-09-05 18:09:33 +02:00
4c44496b87
source-mirror: Handle uncaught exceptions in C callbacks
...
Fixes various crashes and undefined behavior due to exceptions falling into C code where they now wreak havoc with the current stack.
2019-09-04 20:52:37 +02:00
f65dfcbbf0
filter-blur: Don't throw exceptions into C code
...
It is extremely problematic to throw C++ exceptions into C code, especially because C code usually does not handle C++ exceptions at all. Therefore we have to prevent any exception from leaving the function and define it as noexcept.
2019-09-04 20:43:40 +02:00
f61cdeb582
utility-event: Fix compile errors
2019-09-04 20:30:16 +02:00
29ab00633c
utility-event: Safer event handling with proper lifetime
...
The util::event code suffers from the problem that it could call into a class that no longer exists, corrupting memory or even crashing. By tracking lifetime using std::weak_ptr<void> this can be avoided and the dead listeners can be automatically removed.
2019-09-04 16:36:32 +02:00
da9124fc1a
util-memory: Avoid MSVC specific C++ and use Std++ if available
2019-09-04 03:22:05 +02:00
82faab4380
project: Re-apply formatting
2019-09-04 03:03:41 +02:00
ce7e4c97d4
project: Don't use non-standard strcmpi
2019-09-04 03:02:19 +02:00
03c704de1a
project: Correct usage of exceptions and include stdexcept
2019-09-04 02:59:04 +02:00
4765c57828
filter-sdf-effects: Don't define structs in nameless unions
2019-09-04 02:49:04 +02:00
f27320c6c9
project: Remove use of P_INITIALIZER
...
Does not support cross-platform very well and breaks on Apple for no apparent reason.
Add resolution scale to shader filter.
2019-09-04 02:47:27 +02:00
9ace96285d
filter-dynamic-mask: Use snprintf instead of sprintf_s
2019-09-04 02:39:59 +02:00
2e98c2e754
color-grade: Fix and improve advanced options
...
These new options allow further control over the Tint tool in Color grading.
2019-09-04 02:18:40 +02:00
781307fbe6
color-grade: Add further Tint options
2019-09-04 01:41:15 +02:00
deeb6719c4
project: Apply formatting
2019-08-24 12:59:32 +02:00
250dc97603
gfx-effect-source: enumerate child sources correctly
2019-08-07 20:40:04 +02:00
a04d102568
gfx-effect-source: Support for textures and some crash resistance
2019-08-07 20:22:12 +02:00
f945f08ab0
strings: Texture formats
2019-08-07 20:21:39 +02:00
d7e66b17f1
filter-shader: Don't ignore all properties
2019-08-07 19:22:10 +02:00
b8fc0d5284
source-shader: Fix rendering
2019-08-07 19:20:44 +02:00
7fdd9498a0
filter-shader: Fix blending
2019-08-07 19:20:32 +02:00
90699f6b6f
gfx-effect-source: Implement defaults for bool, value and matrix
2019-08-07 19:19:56 +02:00
39e6959c67
source-shader: Fix rendering and reapply parameters on change
2019-08-07 18:43:34 +02:00
181df6e3d9
filter-shader: Reapply parameters if there was a change
2019-08-07 18:43:19 +02:00
9be36d5ec4
gfx-effect-source: Add function to get "default" value
2019-08-07 18:42:54 +02:00
2b2f87e6fc
gfx-effect-source: Fix validity check
...
Had the check inverted oops.
2019-08-07 18:16:20 +02:00
c88535c7ab
gfx-effect-source: Remove/replace old defines
2019-08-07 18:11:46 +02:00
c670ab60a1
source-shader: Use custom draw video_render
2019-08-07 18:10:44 +02:00
8cb2ddaa82
source-shader, cmake: 'Shader' source
2019-08-07 18:06:48 +02:00
1b34e5210a
gfx-effect-source: Expose defines to set default file and technique
2019-08-07 18:06:24 +02:00
9ad93c0ee9
filter-shader: Rename from Custom shader
2019-08-07 18:05:49 +02:00
98a18480d0
gfx-effect-source: Fix UI mode detection
2019-08-07 17:45:32 +02:00
8ec8a22928
filter-custom-shader: Add new callbacks
2019-08-07 17:37:52 +02:00
335847945d
gfx-effect-source: Allow overriding value and visibility of parameters
2019-08-07 17:37:34 +02:00
ff4a556f3f
filter-custom-shader: Update to use new gfx::effect_source::effect_source
2019-08-07 17:15:46 +02:00
bde4e278bf
gfx-effect-source: Further work on rewrite
...
This partially implements most behavior to an acceptable degree for use right now.
2019-08-07 17:14:44 +02:00
Michael Fabian 'Xaymar' Dirks