mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-03-10 18:46:10 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,559 Commits 17 Branches 241 Tags
397f3733cfdbdfd2640ca0ac5d8c00fc0558aa1f
Commit Graph

1967 Commits

Author SHA1 Message Date
Jim
397f3733cf Merge pull request #1685 from DDRBoxman/luma 
obs-filters: Add luma key filter
 2019-04-14 04:24:16 -07:00
Jim
9480cc4fd2 Merge pull request #1675 from admshao/clear-linux-compiling-warnings 
Clear linux compiling warnings
 2019-04-14 04:21:21 -07:00
Jim
e7b25a9870 Merge pull request #1667 from grimmy/xshm-xrandr-support 
linux-capture: Add randr support
 2019-04-14 04:15:29 -07:00
geemion
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
Jim
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
Jim
f1399b6d18 Merge pull request #1765 from jpark37/blend-alpha 
libobs: libobs-d3d11: Fix blend alpha overflow
 2019-04-14 00:22:20 -07:00
lorskun
f6f780acd2 rtmp-services: Add OnlyFans streaming service 2019-04-13 03:43:11 -07:00
Jim
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
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
Jim
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
Jim
faa2ba3617 Merge pull request #1776 from jpark37/unused-function 
obs-filters: Remove unused function in shader
 2019-03-26 14:08:02 -07:00
Jim
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 Edwards
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 Edwards
5c16a96770 Merge pull request #1715 from jpark37/area-filter 
Add "Area" scale filter
 2019-03-13 23:30:25 -05:00
Hosein
8b6b8f33de rtmp-services: Add GameTips.tv 
Closes #1724
 2019-03-13 22:21:33 -05:00
jasonlee
6039cbb938 obs-ffmpeg: Use correct calling convention on CreateDXGIFactory1 
Closes #1740
 2019-03-13 20:11:43 -05:00
Colin Edwards
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
jp9000
07c22cb885 image-source: Revert slideshow dynamic loading 
Reverts dynamic loading of images to slideshow.
 2019-03-13 00:07:45 -07:00
Vainock
a99f71ef1c Adjust locales for better consistency 2019-03-12 06:27:47 +01:00
VodBox
ce4bda45df obs-ffmpeg: Change clear on media end wording for media source 
As per mantis issue 1403, the current wording for ClearOnMediaEnd is
ambiguous. Since it says "Hide source", some may believe it to mean the
scene item in the sources list will have it's visibility set to hidden.
This wording makes it clearer what the checkbox actually does.
 2019-03-11 12:16:54 +13:00
Colin Edwards
045aa71e09 Merge pull request #1691 from nocodedweb/master 
rtmp-services: Added GamePlank to services
 2019-03-09 19:51:55 -06:00
Colin Edwards
c4f4b6602b Merge pull request #1648 from DougTy/master 
linux-v4l2: Add setting to change color range
 2019-03-09 18:58:19 -06:00
jp9000
93cc09f078 obs-text, win-capture: Do not use premultiplied alpha 2019-03-07 08:14:34 -08:00
James Park
7d811499e0 Add "Area" scale filter 
This new scale filter computes pixels by weighing the coverage area of
source pixels over the target pixel. This algorithm works well for both
upsampling and downsampling, but was mainly designed to upscale
high-quality low-resolution sources like RGB/HDMI retro consoles. I've
heard of people using odd workarounds like scaling up to very high
resolutions before scaling back down to preserve pixel shartpness. This
algorithm directly addresses this use-case in a much more direct
fashion.

The Area scale filter does a better job of preserving the thickness of
thin features than the Point filter.

The Area scale filter does not look at source pixels that lie outside
of the target pixel, leading to a much sharper image than Bilinear,
Bicubic, and Lanczos filters.

This filter should interpolate pixels in linear space, but OBS is not
equipped to do that at the moment.

libobs: Add GPU effect, and wire up scene serialization.

obs-filters: Add Area as an option for scale_filter.

UI: Add Area as an option for both scene items, and canvas downscaling.
 2019-03-06 20:53:15 -08:00
jp9000
4c7860056e Revert "Merge pull request #1418 from cabirdme/qsv_feature_add" 
This reverts commit 3c22cf35c9, reversing
changes made to c7dab6c92b.

This is being reverted due to many people being unable to start up the
QSV encoder with these changes.
 2019-03-05 15:21:09 -08:00
jp9000
92cb20e7a2 Revert "obs-qsv: Enable b-pyramid & change packet priority" 
This reverts commit 33ff46a10e.

This is being reverted due to many people being unable to start up the
QSV encoder with these changes.
 2019-03-05 15:20:42 -08:00
Richard Stanway
d8812e0808 obs-ffmpeg: Check avformat context before use 2019-03-05 21:58:09 +01:00
Richard Stanway
460c34aeaf obs-ffmpeg: Fix crash on failed audio codec init (for real) 2019-03-05 21:54:12 +01:00
Richard Stanway
b73bffff48 obs-ffmpeg: Fix crash on failed audio codec init 2019-03-05 21:48:58 +01:00
Colin Edwards
e9ec398667 Merge pull request #1670 from pkviet/expredux 
obs-filters/expander: Various improvements
 2019-03-03 22:34:28 -06:00
Colin Edwards
495222f6b9 Merge pull request #1688 from cg2121/fix-slideshow-repeat-image 
image-source: Fix repeating of images with slideshow source
 2019-03-03 22:30:25 -06:00
Colin Edwards
5db9517c6e Merge pull request #1712 from jpark37/highest-fps 
win-dshow: Fix "Highest FPS" algorithm
 2019-03-03 21:42:25 -06:00