jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,719 Commits 1 Branch 0 Tags
Commit Graph

6719 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim
754c4d66c8
Merge pull request #1772 from jpark37/area-filter-glsl-fix 
libobs: Fix Area scale filter for GLSL
 2019-03-26 14:07:39 -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
SoftArch
de66aeab68 UI: Add Restream integration 
Closes obsproject/obs-studio#1768
 2019-03-25 19:13:27 -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
James Park
746820e35a libobs: Fix Area scale filter for GLSL 
Remove const qualifiers because they are syntax errors for GLSL when
used like in C.
 2019-03-23 13:16:50 -07:00
Gol-D-Ace
a81b7a3e58 CI: Don't build service integration in PRs&Forks 
Without this, Fork and PR builds will fail.
 2019-03-23 19:24:04 +01:00
Gol-D-Ace
3e78e05c6e CI: Build service integration on Azure Pipelines 2019-03-23 14:35:29 +01:00
jp9000
3a288e95f4 obs-browser: Make DispatchJSEvent asynchronous 2019-03-22 05:29:08 -07:00
jp9000
70b8f0aa65 libobs: Fix ABI break 
OBS_EFFECT_AREA from 7d811499e was inserted in the middle of the enum,
which breaks ABI for any binaries that use
OBS_EFFECT_PREMULTIPLIED_ALPHA or OBS_EFFECT_BILINEAR_LOWRES.
 2019-03-22 03:46:42 -07:00
Rat
cb3054ae6e CI: Build caption output support on OSX by default 
Enable caption building by default on OSX to make captions usable
on OSX via scripting API.
 2019-03-21 07:46:12 +01:00
Rat
eebb8f6597 deps/obs-scripting: Expose obs_output_output_caption_text1 to scripts 
Make obs_output_output_caption_text1 usable via scripting if captions
are enabled to make adding additional caption sources easier.
 2019-03-21 07:44:44 +01:00
Jim
233c4a85d2
Merge pull request #1751 from cg2121/fix-repeating-images 
image-source: Re-add fix of repeating images
 2019-03-20 19:13:22 -07:00
Vainock
d38f45ba2d Improve locales 2019-03-20 21:50:35 +01:00
Colin Edwards
609c7dfa2a obs-filters: Add luma key filter 2019-03-20 11:37:38 -05:00
Jim
5b4a965fd7
Merge pull request #1762 from Dmitry-Me/fixOutputSpecifiers 
libobs: Fix output type specifiers
 2019-03-20 02:43:36 -07:00
Jim
a0ea389789
Merge pull request #1764 from Gol-D-Ace/remove_and_ignore_obs.rc 
UI: Remove and ignore obs.rc
 2019-03-19 19:23:17 -07:00
Gol-D-Ace
6dfb0caab3 UI: Remove and ignore obs.rc 
This file gets automatically generated from obs.rc.in by CMake and
could get accidentally committed.
 2019-03-20 02:41:38 +01:00
Colin Edwards
2faa015c92
Merge pull request #1753 from Xaymar/patch-obs_property_float_set_limits 
libobs: Fix obs_property_float_set_limits
 2019-03-19 19:43:58 -05:00
Colin Edwards
55c1b5bd7b
Merge pull request #1736 from cg2121/icons-from-theme 
UI: Use icons from theme on Linux
 2019-03-19 19:25:42 -05:00
James Park
5fe128a047 libobs-opengl: Fix bad log string 2019-03-19 09:17:15 -07:00
Dmitry-Me
eea71e5e7f libobs: Fix output type specifiers 2019-03-19 18:29:09 +03:00
James Park
cb67192077 libobs: Fix invalid max_anisotropy value 
max_anisotropy is initialized to zero, but the minimum value is 1.
 2019-03-19 01:26:28 -07:00
Clayton Groeneveld
2080051b9f UI: Use icons from theme on Linux 2019-03-16 05:41:12 -05:00
Gol-D-Ace
e67cae3710 Revert "UI: Add obs.rc to .gitignore" 
This reverts commit 641bd7d3ae6811137861e91b60d5d1c0ef142ec1.
Git can't ignore files that are already tracked.
 2019-03-16 11:15:48 +01:00
Michael Fabian 'Xaymar' Dirks
3cac828a3e libobs: Fix obs_property_float_set_limits 
This function incorrectly checked for an Integer type instead of a
Float type, causing it to do nothing.
 2019-03-16 04:30:33 +01:00
Colin Edwards
3300ba4d33
Merge pull request #1749 from Gol-D-Ace/gitignore-obs.rc 
Add obs.rc to .gitignore
 2019-03-15 22:14:31 -05:00
Colin Edwards
0f54a22d94
Merge pull request #1750 from jpark37/area-filter-remove-downscale 
UI: Remove Area downscale filter option
 2019-03-15 22:11:13 -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
James Park
8b1d701b27 UI: Remove Area downscale filter option 
Originally added for completeness but wasn't actually implemented
correctly. Can be added back later if desired.
 2019-03-14 10:05:50 -07:00
Gol-D-Ace
641bd7d3ae UI: Add obs.rc to .gitignore 
This file gets automatically generated and should not be committed.
 2019-03-14 11:05:49 +01:00
Gol-D-Ace
f27a00d266 Revert "obs-ffmpeg: Add option to use b-frames as reference" 
This reverts commit adf3337d3cdd1fe91cc5c763ff5ea292b4d6787e.
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
Dmitry-Me
b835d7ec05 libobs: Fix effect parsing log specifiers 
Closes #1649
 2019-03-14 00:04:15 -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
Colin Edwards
ef668b239d
Merge pull request #1678 from boxerab/libvlc_pkgconfig 
cmake: Fix pkg-config handling of libvlc
 2019-03-13 23:10:23 -05:00
Colin Edwards
42d69b11ba
Merge pull request #1629 from WizardCM/windows-rc-definition 
UI: Automatically generate Windows file description
 2019-03-13 22:48:56 -05:00
Hosein
8b6b8f33de rtmp-services: Add GameTips.tv 
Closes #1724
 2019-03-13 22:21:33 -05:00
Colin Edwards
1dc3edc805
Merge pull request #1694 from cg2121/audio-mixer-copy-filters 
UI: Add ability to copy & paste filters from the mixer
 2019-03-13 22:13:54 -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
a776a6cf07 libobs/graphics: Add memory usage member to image file 
Allows estimating the required memory usage of an image.
 2019-03-13 01:11:18 -07:00
jp9000
a2829643f4 libobs: Add function to get libobs object data 2019-03-13 00:50:19 -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
jp9000
2f90bcf684 libobs: Fix frame not being cleared 
Fixes the remaining case where a frame from the previous
recording/stream could show up at the beginning of the next
recording/stream on the same running session when using the new version
of NVENC.  Textures are being converted for both raw and texture-based
encoders, so this variable which determines whether a texture is ready
and has been converted should be cleared in both cases.
 2019-03-12 12:54:47 -07:00
Colin Edwards
73b9957ec7
Merge pull request #1739 from Gol-D-Ace/CI-Travis-Xenial 
CI: Build on Ubuntu Xenial for Travis CI
 2019-03-12 12:50:53 -05:00
Colin Edwards
b46df235e7
Merge pull request #1741 from Gol-D-Ace/azure_stuff 
CI: Build for Linux on Azure Pipelines
 2019-03-12 11:19:49 -05:00