mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 21:13:04 +02:00
Code
7,013 Commits 16 Branches 211 Tags 169 MiB
15ade1e2c4
Commit Graph

177 Commits

Author SHA1 Message Date
Jim
5f7ff6fbcc
Merge pull request #1970 from cg2121/fix-warnings 
various: Fix compiler/theme warnings
 2019-08-17 08:22:03 -07:00
Jason Francis
34c8538ab9 cmake: Fix SWIG deprecation warnings 2019-08-16 21:12:31 -04:00
Clayton Groeneveld
e8ad89fc75 libobs, obs-scripting, vlc-video: Fix compiler warnings 2019-08-15 03:00:06 -05:00
Jim
444991ba21
Merge pull request #2021 from jpark37/yuva-format 
Add support for YUV alpha formats
 2019-08-11 20:38:17 -07:00
jpark37
1e87df89bb deps/media-playback: Convert YUV alpha formats to RGB on GPU 
I40A -> RGBA, 1080p, CPU
swscale (MMX), Intel i7-6700: 1910 us -> 0 us

GPU measurements used Intel GPA with SetStablePowerState.

I40A -> RGBA, 1080p, GPU
Intel HD Graphics 530: 0 us -> 677 us
NVIDIA RTX 2080 Ti: 0 us -> 43 us
 2019-08-11 11:26:52 -07:00
jpark37
6600bd13ea deps/media-playback: Add missing header to CMake 2019-08-11 07:27:42 -07:00
Michael Fabian 'Xaymar' Dirks
cdc613a5ea obs-scripting: Use a recursive mutex for Lua scripting 
This enables stacking of Lua driven filters of the same kind without
freezing OBS Studio in place, or even crashing.
 2019-08-08 22:57:35 -07:00
jp9000
68a5a40df9 libobs, obs-ffmpeg, win-dshow: Fix FFmpeg 4.0 deprecation 
Fixes FFmpeg 4.0 deprecation warnings.
 2019-07-29 20:34:13 -07:00
jp9000
a3fface27f win-dshow, obs-ffmpeg: Add hardware decoding support 
Fixes hardware decoding support and updates it to FFmpeg 4.0.
 2019-07-29 20:34:13 -07:00
Richard Stanway
dd3ed096f8
file-updater: Use transparent HTTP compression 2019-07-17 17:22:09 +02: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
ebb8d6bc28
Merge pull request #1767 from ratwithashotgun/caption-pr1 
deps/obs-scripting: Expose obs_output_output_caption_text1 to scripts
 2019-04-15 03:30:30 -07:00
James Park
df05f65d63 deps/media-playback: YUV444P support 
Use libobs for YUV444P conversion previously handled by FFmpeg. This
ensures the libobs path resists rot.
 2019-04-11 23:00:04 -07:00
Rat
eebb8f6597 deps/obs-scripting: Expose obs_output_output_caption_text1 to scripts 
Make obs_output_output_caption_text1 usable via scripting if captions
are enabled to make adding additional caption sources easier.
 2019-03-21 07:44:44 +01:00
J Lynn
36a6629e6b Add support for building on PPC64LE using x86 Intrinsic Compat Shim 2018-12-17 05:33:16 +11:00
jp9000
b3ef46d986 cmake: Make static VC runtime libraries consistent 
Makes Visual C runtime libraries consistent across
Debug/MinSizeRel/Release/RelWithDebInfo, rather than just changing those
flags for RelWithDebInfo.  Also adds /Zl for statically linked
libraries.

Closes obsproject/obs-studio#1421
 2018-09-12 07:49:13 -07:00
Shaolin
1b13e12065 cmake: Fix an error when SWIG isn't found 
obs-scripting CMakeList.txt expects SWIG, Python3 or Luajit to enable
scripting so in case of not finding just return and don't abort
the configuration
 2018-09-09 01:58:11 -03:00
Jim
3be5e414bc
Merge pull request #1362 from Chiitoo/automagic 
cmake: Use less automagic during configure
 2018-09-05 23:57:07 -07:00
jp9000
28e3604a56 deps: Add json11 library for convenience 
Adds a very basic and easy-to-use C++ library strictly for the sake of
convenience when using C++.
 2018-07-29 22:15:03 -07:00
Jimi Huotari
eee6541153
deps/obs-scripting: Use less automagic for Lua/Python detection 
This adds build-time options for disabling the Lua and/or Python
scripting support in cases where users do not wish to build
it, but have the required libraries installed.
 2018-07-11 05:08:47 +03:00
Matthew Szatmary
a8517f3698 libobs: Update libcaption library 
(This commit also modifies deps/libcaption)

Closes obsproject/obs-studio#1354
 2018-07-08 01:14:27 -07:00
jp9000
a6c65cdbf3 deps/obs-scripting: Prevent python unload more than once 2018-03-18 00:57:15 -07:00
Jim
25e92e5d07
Merge pull request #1237 from kkartaltepe/fix-lua 
deps/obs-scripting: Add obs_source_enum_filters
 2018-03-17 17:07:12 -07:00
jp9000
0a6d5772d9 deps/obs-scripting: Don't allow unloading more than once 2018-03-17 16:52:14 -07:00
Kurt Kartaltepe
3293282dcf deps/obs-scripting: Add obs_source_enum_filters 2018-03-17 12:11:22 -05:00
Kurt Kartaltepe
65016d5ade
deps/obs-scripting: Fix tick function arg number 
Tick function was smashing stack every time it was called due to arg number mismatch.
 2018-03-12 10:57:43 -05:00
Exeldro
277b664001 obs-ffmpeg: Add speed percentage option 
(Note: This commit also modifies the deps/media-playback module.)

Allows modifying the speed of local file playback.

Closes jp9000/obs-studio#1091
 2018-02-15 15:18:13 -08:00
jp9000
dc0363d3e8 deps/media-playback: Use a struct for media init data 
Instead of using countless parameters for the media initialization data,
use a structure.
 2018-02-15 13:32:35 -08:00
jp9000
c7c5bb999a deps/obs-scripting: Fix cur. script being NULL for script_tick 
Fixes a bug where the thread local variable "current_lua_script" is not
set when calling script_tick.
 2018-02-01 20:01:46 -08:00
jp9000
a2ae16e98c deps/obs-scripting: Allow NULL script with script_log 
(This commit also modifies the frontend-tools module)

Prevents a potential crash when script_log is called by a thread spawned
by a python library.
 2018-01-31 16:20:45 -08:00
Colin Edwards
285d9bd6f1 CI: Add rpath info to _obspython 2018-01-30 18:15:44 -06:00
jp9000
dce311cf1a deps/obs-scripting: Make ENABLE_SCRIPTING a user variable 
Makes it so that the scripting cmake variable ENABLE_SCRIPTING is a user
variable rather than a global internal cmake variable, and defers the
internal global cmake variable to SCRIPTING_ENABLED instead.
 2018-01-23 20:57:48 -08:00
jp9000
c5b58211da deps/obs-scripting: Prevent potential python startup issues 
Prevents Python from automatically trying to load from PATH on startup
on windows.  The user should set their Python 3 path themselves.
 2018-01-22 07:33:17 -08:00
jp9000
3259269c99 deps/obs-scripting: Fix script_log in python to append newline 2018-01-19 11:10:45 -08:00
jp9000
c9c7dc5748 deps/obs-scripting: Fix frontend API lua table creation 
Lua uses 1-based index on table insertions, and lua_newtable has a bit
better performance than lua_createtable if initializing tables with an
unknown item count.
 2018-01-18 05:59:20 -08:00
jp9000
d01632a4f0 deps/obs-scripting: Fix a few more VC warnings from swigluarun.h 2018-01-18 05:35:19 -08:00
Colin Edwards
f06c0dd7d5 deps/obs-scripting: Ensure that ffi module gets loaded 
Closes jp9000/obs-studio#1158
 2018-01-18 01:49:07 -08:00
Jim
8d60404663
Merge pull request #1155 from DDRBoxman/scripting 
deps/obs-scripting: Various scripting fixes
 2018-01-16 05:24:26 -08:00
jp9000
db2d4c97e8 deps/obs-scripting: Fix installed files/locations on linux 
Uses the 'install' command in cmake to install scripting modules/files
(such as _obspython.so, obslua.so, and obspython.py), and changes the
install location of those files on all operating systems.  If using a
non-unix structure install, those files will be installed in
data/obs-scripting/[32bit/64bit], otherwise with unix structure installs
those files will be installed to [/usr/local/lib]/obs-scripting.
 2018-01-16 03:55:38 -08:00
Colin Edwards
4390a0e7e6 deps/obs-scripting: Add image-file to lua 2018-01-15 21:54:50 -06:00
Colin Edwards
3714424808 deps/obs-scripting: Set current_lua_script earlier to prevent a crash 2018-01-15 21:12:40 -06:00
Colin Edwards
1b49a0541e deps/obs-scripting: Don't crash obs trying to unload a script that failed to load 2018-01-15 20:38:58 -06:00
jp9000
e7de41fc01 deps/media-playback: Free frame data before freeing frame 
Prevents a potential memory leak if data was previously allocated in the
frame.
 2018-01-11 20:07:47 -08:00
jp9000
548f3fa9a9 deps/media-playback: Use avcodec_free_context when possible 
A bit better handling that should prevent any possible memory leakage
due to any internal data allocated by FFmpeg.
 2018-01-11 20:06:21 -08:00
jp9000
2651d076db deps/obs-scripting: Fix swig/python lookup on windows 
Fixes swig/python dependencies to search for the pre-compiled deps on
windows.
 2018-01-07 17:47:55 -08:00
pkviet
67e48ecc2c libobs/media-io: Replace quad with 4.0 
(also obs, deps/media-playback, libobs/audio-monitoring, decklink,
linux-alsa, linux-pulseaudio, mac-capture, obs-ffmpeg, win-dshow,
win-wasapi)

Default channel layout for 4 channels is 4.0 in FFmpeg.
Replacing quad with 4.0 will improve compatibility since FFmpeg has
better support of its default channel layouts.
 2018-01-05 09:48:52 -08:00
jp9000
9eabfdbf1e deps/obs-scripting: Add scripting support 
Allows Lua/Python scripting support.
 2018-01-04 11:37:42 -08:00
jp9000
0497095f97 Fix a number of GCC warnings 2017-12-06 16:42:45 -08:00
jp9000
0d6204c8af Fix a number of MSVC warnings 
Fixes a number of warnings with all modules
 2017-12-05 13:53:44 -08:00