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

6644 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Gol-D-Ace
f0cd1f61c4 CI: Build for Linux on Azure Pipelines 2019-03-12 08:19:45 +01:00
Gol-D-Ace
5e01429aa6 CI: Build on Ubuntu Xenial for Travis CI 
Trusty is reaching EOL in April 2019.
 2019-03-12 06:56:25 +01:00
Colin Edwards
7f3ae272c7
Merge pull request #1738 from Gol-D-Ace/locale_improvements 
Adjust locales for better consistency
 2019-03-12 00:31:08 -05:00
Vainock
a99f71ef1c Adjust locales for better consistency 2019-03-12 06:27:47 +01:00
Colin Edwards
0377a34095
Merge pull request #1725 from derrod/bwtest-cbox 
UI: Add checkbox for Twitch bandwidth test mode
 2019-03-11 23:37:23 -05:00
jp9000
bb034308d4 libobs-d3d11: Log errors from HasBadNV12Output just in case 2019-03-11 13:42:47 -07:00
jp9000
4aed743a93 libobs-d3d11: Improve NV12 validity check for AMD 
On some AMD systems, the test for bad NV12 output would come up negative
(output was good), but when recording/streaming, it would have bad
output.  While the test worked correctly with NVIDIA systems, it did not
work in these cases.  This was because we did not correctly reproduce
the exact conditions of green output because the textures used for the
test were not also keyed mutex shared textures.  This fixes that issue
and ensures the test works correctly in those other niche cases.
 2019-03-11 13:42:47 -07:00
Gol-D-Ace
d1cd27410d
Merge pull request #1734 from derrod/discord-webhook 
CI: Always send travis webhook and remove IRC sections
 2019-03-11 13:42:30 +01:00
derrod
22d57dce8b CI: Always send travis webhook and remove IRC sections 
The IRC bot's webhook functionality hasn't worked in some time since
switching host machines. The Discord bot can handle build result changes
itself and having all results will useful for some future expansions
(e.g. tracking latest mac nightly build).
 2019-03-11 05:13:00 +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
2a6070e308
Merge pull request #1732 from derrod/fix-qtsvg-debug 
cmake: Fix Qt DLL filenames for debug builds
 2019-03-10 03:58:33 -05:00
derrod
9cc0d459bd cmake: Fix Qt DLL filenames for debug builds 2019-03-10 09:47:16 +01:00
Colin Edwards
fea204411d
Merge pull request #1731 from Gol-D-Ace/PAL-FPS 
UI: Add PAL 25 & 50 FPS as common FPS values
 2019-03-10 01:55:00 -06:00
derrod
4595d49e98 UI: Add confirmation dialog for bandwidth test mode 2019-03-10 08:37:29 +01:00
Gol-D-Ace
7c0620b54f UI: Add PAL 25 & 50 FPS as common FPS values 2019-03-10 08:31:08 +01: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
Colin Edwards
5b9e96c15b
Merge pull request #1584 from cg2121/settings-icons 
UI: Redo settings icons
 2019-03-09 18:49:05 -06:00
Colin Edwards
7d4252123e
Merge pull request #1727 from cg2121/locale-patch 
UI: Fix a couple of locale issues
 2019-03-09 17:18:09 -06:00
Colin Edwards
4089a95417
Merge pull request #1723 from Gol-D-Ace/azure_stuff 
CI: Build 32/64 bit Windows parallel on Azure
 2019-03-09 17:14:35 -06:00
Clayton Groeneveld
e5cca6b2a5 UI: Fix yes/no not using localization in no source dialog 2019-03-09 03:49:58 -06:00
Clayton Groeneveld
4b64aef555 UI: Change HDD to Disk in locale 2019-03-09 03:25:01 -06:00
derrod
51bfb9d899 UI: Add checkbox for Twitch bandwidth test mode 2019-03-09 02:54:41 +01:00
Gol-D-Ace
c6b61887f0 CI: Build 32/64 bit Windows parallel on Azure 2019-03-08 05:46:11 +01:00
Colin Edwards
c55f006058
Merge pull request #1722 from Gol-D-Ace/azure_stuff 
CI: Build for windows on Azure Pipelines
 2019-03-07 11:31:09 -06:00