starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-08-28 02:34:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
6,649 Commits 20 Branches 251 Tags
metal
Commit Graph
1982 Commits
Author SHA1 Message Date
jp9000 0677fe2b21 obs-ffmpeg: Move ffmpeg-mux to executable dir 
Instead of having ffmpeg-mux stored in a data directory, install it to
the primary binary directory.  On windows, this fixes ffmpeg-mux
potentially accessing the wrong FFmpeg libraries (some programs install
them to system32, foolishly), and instead ensures that it uses the ones
that come with the program.  On Linux, ensures that a binary is in its
appropriate directory (/usr/bin or /usr/local/bin rather than a subset
of /usr/share or /usr/local/share).
 2019-04-26 13:24:34 -07:00
jp9000 0800c8cbd1 obs-filters: Use int sliders for opacity 
This changes all opacity scrollers for filters to sliders + scrollers.

Reference: obsproject/obs-studio#1827
 2019-04-26 06:33:41 -07:00
jp9000 71f9900e74 obs-filters: Fix opacity on image mask/blend filter 
The alpha value from the opacity slider was being overwritten.

Closes obsproject/obs-studio#1827
 2019-04-26 05:22:44 -07:00
James Parkandjp9000 a86710ec5b libobs: Support limited color range for RGB/Y800 sources 
libobs: Add support for limited to full color range conversions when
using RGB or Y800 formats, and move RGB converison for Y800 formats to
the GPU.

decklink: Stop hiding color space/range properties for RGB formats, and
remove "YUV" from "YUV Color Space" and "YUV Color Range".

win-dshow: Remove "YUV" from "YUV Color Space" and "YUV Color Range".

UI: Remove "YUV" from "YUV Color Space" and "YUV Color Range".
 2019-04-25 15:13:05 -07:00
jp9000 7d136c3ce1 decklink, win-dshow: Use obs_source_output_video2 
Allows the ability to override and use partial range RGB with the
DirectShow and Decklink device sources when partial range RGB is
implemented.  Fixes certain cases where devices could capture RGB in
limited range via HDMI (per the HDMI specs).
 2019-04-25 15:12:33 -07:00
jp9000 f109d1c2bf Revert "libobs: libobs-d3d11: obs-filters: No excess alpha" 
This reverts commit d91bd327d7, which
broke alpha with sources, scenes, and filter, causing them all to become
opaque unintentionally.
 2019-04-25 08:36:41 -07:00
pkv a5b837518e obs-outputs: Fix leak with certs for rtmp 2019-04-21 23:54:27 +02:00
Igor Bochkariovandjp9000 69b4df41c6 win-wasapi: Unapply/reapply audio monitoring on reconnect 
Saves and disable monitoring before entering recover loop, and restores
it after recovery is complete.
 2019-04-20 03:37:24 -07:00
Igor Bochkariovandjp9000 041d3b4155 win-wasapi: Fix audio capture after unplugging device 
This commit fixes a bug where the user would have to restart OBS when
certain types of devices are unplugged and plugged back in again
(particularly USB devices).  A wait interval is required
(RECONNECT_INTERVAL) because Windows does not send any events to
IAudioCaptureClient on device invalidation.
 2019-04-20 03:37:24 -07:00
Igor Bochkariovandjp9000 abe59f7187 win-wasapi: Call CoInitializeEx in reconnect thread 
Fixes an issue where COM might not be available to calls within the
reconnect thread.
 2019-04-20 03:37:24 -07:00
jp9000 77d92421ed rtmp-services: Update Mixer keyframe interval 2019-04-19 11:10:40 -07:00
Richard Stanwayandjp9000 ca5a19cf66 obs-ffmpeg: Add logging of last error for passing to UI 2019-04-19 05:45:38 -07:00
dwotandjp9000 8c7dbf69f2 vlc-video: Enable subtitle track selection 2019-04-17 06:45:33 -07:00
JimandGitHub 10e72fcc2a Merge pull request #1752 from pkviet/vlc 
vlc-video: Enable audio track selection
 2019-04-14 05:13:47 -07:00
JimandGitHub 397f3733cf Merge pull request #1685 from DDRBoxman/luma 
obs-filters: Add luma key filter
 2019-04-14 04:24:16 -07:00
JimandGitHub 9480cc4fd2 Merge pull request #1675 from admshao/clear-linux-compiling-warnings 
Clear linux compiling warnings
 2019-04-14 04:21:21 -07:00
JimandGitHub e7b25a9870 Merge pull request #1667 from grimmy/xshm-xrandr-support 
linux-capture: Add randr support
 2019-04-14 04:15:29 -07:00
geemionandjp9000 f6581952bc win-capture/graphics-hook: Check if mutex abandoned 
It's possible that the mutexes used with shared memory capture to return
WAIT_ABANDONED if OBS is shut down abnormally while the mutex is locked.
 2019-04-14 03:44:48 -07:00
JimandGitHub 30e90c3030 Merge pull request #1573 from DragoonAethis/master 
obs-ffmpeg: Bind network buffer size in the UI
 2019-04-14 02:51:14 -07:00
JimandGitHub f1399b6d18 Merge pull request #1765 from jpark37/blend-alpha 
libobs: libobs-d3d11: Fix blend alpha overflow
 2019-04-14 00:22:20 -07:00
lorskunandjp9000 f6f780acd2 rtmp-services: Add OnlyFans streaming service 2019-04-13 03:43:11 -07:00
JimandGitHub d0f52a6479 Merge pull request #1781 from cg2121/color-source-default-size 
image-source: Set default size of color source to canvas size
 2019-04-10 17:38:51 -07:00
Gol-D-Ace 9fc1069e9b Remove double spaces from localization 2019-04-08 16:02:32 +02:00
pkv 5114dc1b91 vlc-video: Enable audio track selection 2019-04-08 12:25:40 +02:00
James Park d91bd327d7 libobs: libobs-d3d11: obs-filters: No excess alpha 
Currently SrcBlendAlpha and DestBlendAlpha are both ONE, and can
combine together to form two. This is not a noticeable problem for
UNORM targets because the channels are clamped, but it will likely
become a problem if FLOAT targets are more widely used.

This change switches DestBlendAlpha to INVSRCALPHA, and starts
backgrounds as opaque black instead of transparent black. The blending
behavior of stacked transparents is preserved without overflowing the
alpha channel.
 2019-04-07 18:16:56 -07:00
JimandGitHub a0ead6f974 Merge pull request #1800 from cg2121/add-pragma-once 
UI, libobs, text-freetype2: Add missing pragma once in header files
 2019-04-06 23:40:43 -07:00
Gary Kramlich 758868093b linux-capture: Add randr support 
Add randr suport to the xshm plugin and prefer it over xinerama.

Add libxcb-xrandr0-dev as CI dependency
 2019-04-05 16:05:59 -05:00
jp9000 6550c0dfaa obs-ffmpeg: Remove "A" variants from NVENC blacklist 2019-04-05 07:36:13 -07:00
Gol-D-Ace e78ac5ebef Update translations from Crowdin 2019-04-04 16:19:51 +02:00
Clayton Groeneveld d1be93ae69 UI, libobs, text-freetype2: Add missing pragma once in header files 2019-04-01 02:48:28 -05:00
Shaolin 54f4e2589a plugins: Clear all compiler warnings 2019-03-29 06:29:09 -03:00
jp9000 d18c62b2b5 libobs, image-source: Fix ABI break in image_file_t structure 
In commit a776a6cf07, the image_file_t structure (which is a public
structure) had a member variable added to it, which broke ABI.
 2019-03-28 22:30:20 -07:00
jp9000 5d83e1aec4 obs-ffmpeg: Show encoder name when logging jim-nvenc 2019-03-28 16:38:14 -07:00
Clayton Groeneveld 46c5780a77 image-source: Set default size of color source to canvas size 2019-03-27 22:00:33 -05:00
JimandGitHub faa2ba3617 Merge pull request #1776 from jpark37/unused-function 
obs-filters: Remove unused function in shader
 2019-03-26 14:08:02 -07:00
JimandGitHub 02dad0b858 Merge pull request #1779 from jpark37/sharpness-cleanup 
libobs: Remove dead code in sharpness effect
 2019-03-26 14:06:41 -07:00
jp9000 c18aab29ee obs-ffmpeg: Fix blacklisted adapter check 
The quadro P5000 would incorrectly be considered blacklisted because it
used a string search for the P500, which is an earlier quadro variant
that does not have NVENC support.

To fix this, instead of just doing a string search, additionally check
to make sure that there preceding or trailing numbers on the adapter
name.
 2019-03-26 03:00:00 -07:00
Richard Stanway 0bf09160e5 win-dshow: Update libdshowcapture for crash fix 2019-03-25 17:16:21 +01:00
James Park 36201d9b67 libobs: Remove dead code in sharpness effect 
Not sure why, but there's a dead uniform and interpolant in the
sharpness effect. This change removes them.
 2019-03-25 08:38:45 -07:00
James Park f046177c4f obs-filters: Remove unused function in shader 
SampleYUVToRGB() is no longer used after the previous DrawMatrix purge.
 2019-03-23 18:31:38 -07:00
jp9000 3a288e95f4 obs-browser: Make DispatchJSEvent asynchronous 2019-03-22 05:29:08 -07:00
Colin Edwards 609c7dfa2a obs-filters: Add luma key filter 2019-03-20 11:37:38 -05:00
Clayton Groeneveld f101ea0834 image-source: Re-add fix of repeating images 
With the dynamic loading of images being reverted, the fix for
this separate issue was also reverted.
 2019-03-14 12:23:36 -05:00
Gol-D-Ace f27a00d266 Revert "obs-ffmpeg: Add option to use b-frames as reference" 
This reverts commit adf3337d3c.
Currently causing timestamp issues resulting in FPS issues.
 2019-03-14 10:05:55 +01:00
Colin EdwardsandGitHub e001e2d1b9 Merge pull request #1733 from VodBox/media-source-wording 
obs-ffmpeg: Change clear on media end wording for media source
 2019-03-14 00:17:42 -05:00
Colin EdwardsandGitHub 5c16a96770 Merge pull request #1715 from jpark37/area-filter 
Add "Area" scale filter
 2019-03-13 23:30:25 -05:00
HoseinandColin Edwards 8b6b8f33de rtmp-services: Add GameTips.tv 
Closes #1724
 2019-03-13 22:21:33 -05:00
jasonleeandColin Edwards 6039cbb938 obs-ffmpeg: Use correct calling convention on CreateDXGIFactory1 
Closes #1740
 2019-03-13 20:11:43 -05:00
Colin EdwardsandGitHub 01b6672de5 Merge pull request #1671 from derrod/nvenc-bframeasreferenceoption 
obs-ffmpeg: Add option to use b-frames as reference
 2019-03-13 19:10:59 -05:00
jp9000 c88bd219cb image-source: Add memory usage limit to slideshow 
This prevents users from loading too much image data at once.  It will
only add as many files within the memory limit.
 2019-03-13 01:12:40 -07:00