opensource/obs-studio
3
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-24 23:31:36 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,580 Commits 20 Branches 251 Tags
f9d664302e6943e2bd2c19b4b6e370aecc8ca276
Commit Graph
2592 Commits
Author SHA1 Message Date
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
jpark37 34d70c6832 obs-filters: 3D LUT tetrahedral interpolation 
As requested by Adobe CUBE spec.
 2020-04-08 17:00:45 -07: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
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
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
Kurt Kartaltepe c5b731e48f cmake: Fix warnings and normalize variables/errors 
As of 3.17 using find_package_handle_standard_args checks that the name
of the FindXXX file and the first argument are the same case.

Some modules used non-standard variables or the old singular variables
instead of plurals. This normalizes variable usage to the new-style.

Some CMakeLists.txt did custom error checking instead of propagating
find_package errors. These were changes to call find_package with
REQUIRED or without QUIET where needed and shortens the custom status
messages. This helps users who want to enable that functionality see
what precisely wasnt found.
 2020-04-03 21:32:10 -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
Douglas Rhine b216b90a5c obs-ffmpeg: Rename and add more VAAPI levels 
The Auto level lets the encoder decide which level to use.
Furthermore, some devices allow levels beyond 4.2. Therefore,
we add all levels allowed by H.264. This is of importance,
since using a resolution not supported by the specified level
can trigger undefined behavior on the hardware/kernel.
 2020-04-03 07:12:05 +01: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
Douglas Rhine 04d7ff5854 obs-ffmpeg: Expose VAAPI profile choices 
Allow choosing Constrained Baseline, Main and High.
 2020-04-02 18:10:03 +01:00
SoraYuki 7f0d57f535 rtmp-services: Fix memory leak when update rtmp-custom-service. 2020-03-30 15:49:49 +08:00
jpark37 8987fc6c81 win-capture: Verify VK_KHR_external_memory_win32 support 
Good practice to verify necessary extensions exist. We'll probably need
keyed mutex extension in the future to support Intel.
 2020-03-29 10:08:03 -07:00
jpark37 21dc1f573b win-capture: Cleaner COM usage 
Remove hard-coded GUIDs, call correct functions, and clean up
unnecessary casts.
 2020-03-29 10:00:36 -07: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
jpark37 e1739707d0 win-capture: Use VkAllocationCallbacks 2020-03-27 23:59:37 -07: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
jpark37 3aef198921 obs-filters: Implement CUBE LUT domain properly 
Previously assuming zero to one instead of respecting values.
 2020-03-22 18:25:32 -07: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
Jim b94506e84a Merge pull request #2533 from jpark37/lut-file-filter 
obs-filters: Fix LUT file extension filter on Linux
 2020-03-20 19:06:11 -07:00
Jim 09370e8599 Merge pull request #2528 from RytoEX/fix-qsv-target-usages 
obs-qsv11: Fix target usage values
 2020-03-20 19:05:35 -07:00
jpark37 f3b2fc37c1 obs-filters: Fix LUT file extension filter on Linux 2020-03-20 17:41:18 -07:00
Richard Stanway 4563e03442 win-wasapi: Fix leaking IPropertyStore 2020-03-20 17:58:14 +01:00
Richard Stanway 21737d5f7a win-wasapi: Fix crash on certain devices 
Not all devices return PKEY_AudioEngine_DeviceFormat properties.

Per MSDN, if the PROPERTYKEY referenced in key is not present in
the property store, this method returns S_OK and the vt member of
the structure pointed to by pv is set to VT_EMPTY.
 2020-03-20 17:53:18 +01:00
Ryan Foster 56348a0b46 obs-qsv11: Fix target usage values 
PR #1937 (commit b9ad1ce) added QSV target usage options, but there was
a comma missing between two of the array entries. This resulted in
"faster" and "veryfast" becoming "fasterveryfast", which is not valid.

Code style changes were required by .clang-format.
 2020-03-20 05:30:18 -04:00
jp9000 8ecfb405ce Revert "win-capture, libobs: Show names of displays in Display Capture" 
This reverts commit 9931f22ff4.
 2020-03-19 06:43:57 -07:00