OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-19 17:49:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
8135 commits 15 branches 208 tags 185 MiB
Commit graph

8135 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard Stanway 80d3d67847
Merge pull request #2708 from ken3353/fix-jack-input-client 
linux-jack: Fix conversion from channels to speaker layout
 2020-04-13 17:39:22 +02:00
chaselliu 04e76d7d94 linux-jack: Fix conversion from channels to speaker layout 2020-04-13 22:42:31 +08:00
Bennik2000 26810c31b6 obs-ffmpeg: Fix media source not closing file when inactive 2020-04-13 09:13:16 +02:00
Richard Stanway a43c10b173 UI: Refuse drop operations from our own widgets 
The UI feedback when dropping scene / source items on other parts of the
program indicated that something would happen instead of showing the
"no drop" icon.
 2020-04-13 03:07:30 +02:00
Richard Stanway 6e48f41d1f
Merge pull request #2673 from emaste/projector-screen 
UI: Fix projector on other than primary display
 2020-04-13 01:03:45 +02:00
Ed Maste 7325eace24 UI: Fix projector on other than primary display 
Calling showFullScreen after setGeometry puts the projector on the
expected monitor.  Previously (on FreeBSD, at least) it opened on the
primary display.
 2020-04-12 18:43:23 -04:00
Ed Maste ec7fbadcdb linux-v4l2: Fix build with Clang 10.0 
add_control_property() was previously static inline bool, but did not
return a value and failed to build on FreeBSD-CURRENT with Clang 10.0,
with:

error: non-void function 'add_control_property' should return a value
 2020-04-12 18:41:36 -04:00
Richard Stanway 9fffd99661
Merge pull request #2109 from notr1ch/encoder-error-feedback 
obs-ffmpeg: Encoder error feedback
 2020-04-12 17:59:24 +02:00
Richard Stanway 15781073dc obs-ffmpeg: Add error text for NVENC AVERROR_EXTERNAL 
Since new NVENC still falls back, try to make the error from ffmpeg
NVENC more actionable for users.
 2020-04-12 17:35:27 +02:00
Richard Stanway 5e3e9c1f13 obs-ffmpeg: Use new encoder error handling functions 2020-04-12 17:05:19 +02:00
Richard Stanway 5dc9f989d6 libobs: Add support functions for encoder error handling 
Similar to how outputs can pass errors, add the same functionality for
encoders so that if an output encoder has an error, it is made available
to the output and eventually the UI / user.
 2020-04-12 17:05:19 +02:00
Richard Stanway ba18da6959
Merge pull request #2669 from emaste/gnu-stack 
deps: lzma: also use .note.GNU-stack on FreeBSD
 2020-04-12 16:48:28 +02:00
Richard Stanway 6dce4662cf
Merge pull request #2682 from koizuka/rtmp-services-niconico 
rtmp-services: Add niconico
 2020-04-12 01:59:39 +02:00
Colin Edwards c5125e0a17
Merge pull request #2691 from DDRBoxman/syphon_arc 
mac-syphon: Move the syphon plugin over to ARC
 2020-04-10 20:59:54 -05:00
Colin Edwards eb40dbd453 mac-syphon: Move the syphon plugin over to ARC 2020-04-10 20:10:27 -05:00
Colin Edwards 2552cf9169
Merge pull request #2689 from obsproject/CI 
CI: Rewrite new deps paths in obs-ouputs.so
 2020-04-09 22:54:56 -05:00
Colin Edwards 7366b45392 CI: Rewrite new deps paths in obs-ouputs.so 2020-04-09 22:29:41 -05:00
Colin Edwards 1627623f4d
Merge pull request #2688 from DDRBoxman/githubformat 
CI: Move clang format check into a seperate github workflow
 2020-04-09 21:27:53 -05:00
Colin Edwards 8b6f6d1c85 CI: Move clang format check into a seperate github workflow 2020-04-09 21:26:41 -05:00
Richard Stanway 9023a57afc
Merge pull request #2598 from sorayuki/bugfix/rtmp-custom-memleak 
rtmp-services: Fix memory leak when updating rtmp-custom-service.
 2020-04-10 00:45:43 +02:00
Richard Stanway 011c760a7a
Merge pull request #2641 from kkartaltepe/obs-outputs-warnings 
obs-outputs: Fix warnings WITH_RTMPS=OFF
 2020-04-10 00:42:24 +02:00
Richard Stanway 2d261e79ff
Merge pull request #2663 from khng300/obs-25-fbsd-fix-execpath 
libobs/util: Add FreeBSD and Dragonfly support in os_get_executable_path_ptr()
 2020-04-10 00:40:46 +02:00
Richard Stanway 25054d233c
Merge pull request #2677 from emaste/warning-fix 
UI: Fix warning compiling with Clang 10
 2020-04-10 00:39:07 +02:00
Ed Maste 9f4aaf22f0 UI: Fix warning when compiling with Clang 10 
Building with Clang 10 on FreeBSD 13-CURRENT emitted a warning about
logical not (!) applying only to the left hand side of a comparison.
Update the expression to match the style of other flags conditionals.
Verified that object code is the same.
 2020-04-10 00:37:37 +02:00
Richard Stanway dca5f2fcdb UI: Properly apply hide cursor on fullscreen projectors 
If a projector was created fullscreen, the isFullScreen() call would
fail since the window hasn't been displayed by Qt yet, resulting in the
cursor hiding choice not being applied. This moves the cursor hiding
into the SetMonitor call which is used for all code paths creating a
fullscreen projector, ensuring the setting is applied.

Fixes https://github.com/obsproject/obs-studio/issues/2687
 2020-04-10 00:32:09 +02:00
Akihiko Koizuka d7dc544a38 rtmp-services: Add niconico 2020-04-10 00:22:57 +09:00
Colin Edwards da35310363
Merge pull request #2671 from pkviet/logfilter 
UI: Log global audio devices and their filters
 2020-04-09 01:04:08 -05:00
Colin Edwards c48c9ed2de
Merge pull request #2537 from WizardCM/studio-program-label 
UI: Don't open Studio Mode's "Program" label in a window
 2020-04-09 00:46:48 -05:00
Colin Edwards 46c59fb13a
Merge pull request #2639 from WizardCM/no-transform 
UI: Require selected source for Transform shortcut
 2020-04-09 00:42:37 -05:00
Wahaj Dar e132676d29 rtmp-services: Update castr.io rtmp ingest list 
Closes #2559
 2020-04-09 00:32:32 -05:00
Colin Edwards 414f0ab824
Merge pull request #2571 from bongalive/master 
rtmp-services: Update Bongacams servers and settings
 2020-04-09 00:25:36 -05:00
Colin Edwards 276869be33
Merge pull request #2679 from kkartaltepe/ui-include-fix 
UI: Fix missing includes
 2020-04-09 00:20:47 -05:00
Colin Edwards 3b27eee20f
Merge pull request #2577 from yalpul/patch-1 
CI: Make processor count consistent
 2020-04-09 00:20:35 -05:00
Kurt Kartaltepe 35f9e82956 UI: Fix missing includes 
These files appeared to be dependent on their include order and were
missing definitions when files were compiled in a different order.
 2020-04-08 17:20:52 -07:00
jpark37 34d70c6832 obs-filters: 3D LUT tetrahedral interpolation 
As requested by Adobe CUBE spec.
 2020-04-08 17:00:45 -07:00
jp9000 e10d44d5f5 libobs: Update version to 25.0.5 (mac release) 2020-04-08 16:21:09 -07:00
jp9000 2a318d915f libobs-opengl: Fix atan2 HLSL->GLSL transpile 2020-04-07 23:59:14 -07:00
jp9000 6ca52db8ce libobs-opengl: Add sincos to HLSL->GLSL transpile 2020-04-07 23:59:14 -07:00
jp9000 bc7dd6e931 obs-browser: Fix formatting 2020-04-07 23:57:29 -07:00
Colin Edwards 921a742966
Merge pull request #2617 from RytoEX/update-macos-deps 
CI: Update macOS dependencies
 2020-04-07 14:51:16 -05:00
Ka Ho Ng ab2743dd23 libobs/util: FreeBSD/Dragonfly exec path support 
Add support for FreeBSD and Dragonfly in os_get_executable_path_ptr().
This is required to obtain the path of the running executable image
correctly.

Fixes https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=245299
Fixes https://github.com/obsproject/obs-studio/issues/2622
 2020-04-08 03:44:40 +08:00
pkv 92989bd42b UI: Log global audio devices and their filters 
Request from support-team.
Currently only sources in Scenes are logged with their filters.
This excludes global audio sources set in Settings > Audio.
This patch remedies this.
 2020-04-07 21:33:09 +02:00
Colin Edwards de6643b8ea CI: Update dependencies on macOS 2020-04-07 14:06:54 -05:00
David Bieber 46979536a1 mac-capture: update owner_pid in update_window 2020-04-07 13:30:53 -04:00
David Bieber 4718e5ecf5 mac-capture: Use int in place of NSNumber for owner_pid 2020-04-07 13:26:46 -04:00
Ed Maste f4e7bd31ab deps: lzma: also use .note.GNU-stack on FreeBSD 
FreeBSD uses the same .note.GNU-stack section to indicate that the
stack should not be executable.
 2020-04-07 13:25:43 -04:00
David Bieber ebbe856d83 mac-capture: Only find window by window id when owner name and pid match 2020-04-05 22:10:36 -04:00
David Bieber 239cad00e4 mac-capture: Use window id to identify windows on MacOS 
Use a window's window id in init_window in the mac window capture plugin.
 2020-04-05 22:09:49 -04:00
Hans Petter Selasky 62a174ec39 plugins: Build ALSA plugin for FreeBSD 
Signed-off-by: Hans Petter Selasky <hps@selasky.org>
 2020-04-05 20:39:53 +02:00
Hans Petter Selasky 0e4ea14ba1 libobs: Implement and use better scaling function for 64-bit integers 
As os_gettime_ns() gets large the current scaling methods, mostly by casting
to uint64_t, may lead to numerical overflows. Sweep the code and use
util_mul_div64() where applicable.

Signed-off-by: Hans Petter Selasky <hps@selasky.org>
 2020-04-05 20:27:28 +02:00