mirror/obs-studio
1
0 Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-10-21 05:24:47 -04:00
Code Issues Packages Projects Releases Wiki Activity
8,005 Commits 19 Branches 260 Tags
6a567eded646b2d97a755cd53bf35b0ef6f437d7
Commit Graph
2398 Commits
Author SHA1 Message Date
Colin Edwards 8b1b6b1e75 Merge pull request #2656 from dbieber/z2020-04-05-mac-capture 
mac-capture: Use window id to identify windows on MacOS
 2020-04-18 18:48:29 -05:00
Colin Edwards 55e2985026 Merge pull request #1944 from WizardCM/windows-rc-definition 
CMake: Build Windows modules with file descriptors
 2020-04-18 18:27:22 -05:00
Colin Edwards c03bad85ef Merge pull request #2658 from hselasky/alsa_support_freebsd 
plugins: Build ALSA plugin for FreeBSD
 2020-04-18 17:39:25 -05:00
Jim 05b66262c8 Merge pull request #1786 from brittneysclark/qsv_texture_based_encoding 
obs-qsv: Enable QSV texture-based encoding
 2020-04-18 12:30:26 -07:00
jp9000 01df98b3aa obs-vst: Fix formatting 2020-04-18 12:28:19 -07:00
jp9000 5d45249d9f obs-browser: Fix formatting 2020-04-18 12:28:05 -07:00
Richard Stanway 4fda6cf846 Merge pull request #2700 from Bennik2000/mantis_0001603 
obs-ffmpeg: Fix media source not closing file when inactive
 2020-04-18 21:24:25 +02:00
wolf247 8a5ad6ac92 rtmp-services: Update ChathostessModels service (#2745) 2020-04-18 01:29:47 -05:00
Ben Torell 97067f853f Merge pull request #2667 from emaste/buildfix 
linux-v4l2: Fix build with Clang 10.0
 2020-04-17 14:42:49 -04:00
brittneysclark cc896b6c03 obs-qsv11: Enable QSV texture-based encoding 
Enables a pipeline for texture-based encoding with QSV. Utilizes OBS
NV12 output for encode to avoid offloading them from GPU, which will
increase performance. The option to select old QSV pipeline still
remains and will fallback if new pipeline fails.
 2020-04-17 09:05:52 -07:00
Keylase 8726425a6c rtmp-services: Add WASDTV (#2697) 2020-04-15 17:29:36 -05:00
Colin Edwards e7636f89a6 obs-vst: Don't allow widget close on macOS 2020-04-13 19:28:55 -05: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
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 6dce4662cf Merge pull request #2682 from koizuka/rtmp-services-niconico 
rtmp-services: Add niconico
 2020-04-12 01:59:39 +02:00
Colin Edwards eb40dbd453 mac-syphon: Move the syphon plugin over to ARC 2020-04-10 20:10:27 -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
Akihiko Koizuka d7dc544a38 rtmp-services: Add niconico 2020-04-10 00:22:57 +09: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
jp9000 bc7dd6e931 obs-browser: Fix formatting 2020-04-07 23:57:29 -07: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
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
jp9000 83991a1345 win-capture: Update graphics hook version to 1.1.4 2020-04-05 03:48:34 -07:00
Kurt Kartaltepe 107c632220 obs-outputs: Fix warnings WITH_RTMPS=OFF 
Some unused variables were not marked unused when RTMPS was disabled.
 2020-04-04 11:09:12 -07:00
Jim dbb453d00b Merge pull request #2591 from jpark37/vulkan-unsupported-fix 
win-capture: Fix crash if GPU can't Vulkan capture
 2020-04-03 16:57:02 -07:00
Colin Edwards 9703d17541 Merge pull request #2620 from afriza/patch-1 
Decklink: Fix crash when no matching device
 2020-04-03 18:07:17 -05:00
jp9000 c899d164d9 obs-browser: Fix interact keyboard input on Linux 
Keyboard input wasn't working properly when using interact on Linux --
this should solve it.
 2020-04-03 03:13:24 -07:00
Afriza N. Arief f7332b467a Decklink: Fix crash when no matching device 
OBS crashes when decklink output is auto started and the device is
removed or changed to different model while OBS is not running.

Fixes https://github.com/obsproject/obs-studio/issues/2494
 2020-04-03 00:32:33 +07:00
SoraYuki 7f0d57f535 rtmp-services: Fix memory leak when update rtmp-custom-service. 2020-03-30 15:49:49 +08:00
Richard Stanway b9f7702378 Merge pull request #2563 from skyboy/skyboy-patch-1 
Fix QuickSync LA_ICQ encoder settings
 2020-03-28 23:06:05 +01:00
jpark37 348fcd5b00 win-capture: Fix crash if GPU can't Vulkan capture 2020-03-28 09:01:26 -07:00
skyboy 0c87670ee8 obs-qsv11: Fix QuickSync LA_ICQ encoder settings 2020-03-28 07:31:22 -04:00
Richard Stanway 094edda866 Merge pull request #2578 from sebastinas/json-executable-bits 
rtmp-services: Remove executable bits from json files
 2020-03-28 01:17:28 +01:00
Sebastian Ramacher fe4818ada1 rtmp-services: Remove executable bits from json files 
The bits were set in c0a8e86c9c, but they
are not needed.
 2020-03-27 22:14:24 +01:00
Richard Stanway 75d1f74838 obs-ffmpeg: Expose old NVENC on Windows 7 
New NVENC isn't available on Windows 7 and the old encoder was marked as
internal, giving users no option to use NVENC at all.
 2020-03-27 00:17:49 +01:00
Bongalive c4af7d00de rtmp-services: Update Bongacams servers and settings 2020-03-25 14:25:50 +07:00
Kurt Kartaltepe b822faf73b linux-v4l2: Fixup invalid id 
Previous fix in #2547 altered id before they were handed off to
callbacks and v4l2 wont strip its own flags from ids resulting in
invalid ids in the ioctl.

Instead add cleanup section and jump all branches there before looping.

(Jim edit: I'm changing this entire function so that it isn't horrible.)
 2020-03-23 18:12:14 -07:00
Richard Stanway 1dc2c6a3be obs-outputs: Fix mbed TLS build issues 
Version test macro was using the wrong version, and the non-crypto
MD5 only code was accidentally moved into an #ifdef which ended up
disabling it.

Fixes https://github.com/obsproject/obs-studio/issues/2426
 2020-03-23 17:32:39 +01:00
Jim a0e8adbc42 Merge pull request #2547 from kkartaltepe/v4l2-control-inf-loop 
linux-v4l2: readonly controls cause infinite loop
 2020-03-22 11:42:32 -07:00
Kurt Kartaltepe 7b71a3b33d linux-v4l2: readonly controls cause infinite loop 
v4l2_ioctl will clear the V4L2_CTRL_FLAG_NEXT_CTRL flag resulting in
infinite loops for any driver that reported readonly, disabled, or
volitile controls.
 2020-03-22 10:48:36 -07:00
Jim 8e7481fb75 Merge pull request #2497 from keith-packard/linux-capture-randr-monitors 
linux-capture: Use RandR monitors for screen information
 2020-03-21 19:46:41 -07:00