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

8130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim
665180350d
Merge pull request #2657 from hselasky/improvement 
libobs: Implement and use better scaling function for 64-bit integers
 2020-05-21 18:07:53 -07:00
Jim
e822b47427
Merge pull request #2442 from WizardCM/windows-extras 
Windows: Taskbar icon & colour
 2020-05-21 17:45:34 -07:00
Jim
9607a9f46e
Merge pull request #2384 from LiamCoal/allow-no-buffering 
media-playback: Unbuffered Media Source
 2020-05-21 17:40:08 -07:00
Jim
770408a7da
Merge pull request #2967 from jpark37/promotion-warnings 
libobs: Fix potential truncation warnings
 2020-05-21 17:36:35 -07:00
Jim
dedc0c01d5
Merge pull request #2964 from jpark37/winrt-dispatcher 
Set up dispatcher queue for WGC stability
 2020-05-21 17:31:30 -07:00
Jim
ad919b47ea
Merge pull request #2921 from jpark37/vulkan-format-fail 
win-capture: Fail on unsupported Vulkan formats
 2020-05-21 17:29:57 -07:00
Jim
c5187aef16
Merge pull request #2908 from jpark37/wgc-minimize 
Fix WGC minimize handling
 2020-05-21 17:29:04 -07:00
jpark37
cd6f56d0ea libobs: Fix potential truncation warnings 2020-05-21 10:02:03 -07:00
jpark37
5734ab7a9b libobs: WinRT and dispatcher init on graphics thread 
Suspected necessary for WGC stability.
 2020-05-21 09:25:54 -07:00
jpark37
49bc89f2b2 libobs-winrt: Add dispatcher queue API 
Suspected necessary for WGC stability.
 2020-05-21 09:25:50 -07:00
jp9000
8d6f29ffc7 Revert "Merge pull request #2637 from kkartaltepe/cmake-variety-fixes" 
This reverts commit d777000a60cb9ccd78b3bdf1fbae3583b55aac0c, reversing
changes made to c9e5f30a78d087e42434813df1c56076049d62c3.
 2020-05-21 00:03:09 -07:00
Jim
d777000a60
Merge pull request #2637 from kkartaltepe/cmake-variety-fixes 
cmake: Fix warnings and normalize variables/errors
 2020-05-20 23:45:25 -07:00
Jim
c9e5f30a78
Merge pull request #2635 from kkartaltepe/install-headers-1 
UI: Install public headers for frontend-api
 2020-05-20 20:39:17 -07:00
Kurt Kartaltepe
51a5be64d8 UI: Install public headers for frontend-api 
Previously the api header was not targeted for installation and may have
been missing for third party users.
 2020-05-20 19:53:14 -07:00
Jim
89ccad8a2b
Merge pull request #2619 from dgcampea/ffmpeg-vaapi 
Expose more levels and profiles for FFmpeg VAAPI
 2020-05-20 19:49:41 -07:00
Jim
cb98f456eb
Merge pull request #2595 from jpark37/vulkan-cleanup 
Vulkan hook COM clean up, and extension check
 2020-05-20 18:20:05 -07:00
Jim
23ee7aebc6
Merge pull request #2589 from jpark37/vulkan-alloc 
win-capture: Use VkAllocationCallbacks
 2020-05-20 18:17:20 -07:00
Jim
0e4dcff490
Merge pull request #2570 from cg2121/auto-config-res 
UI: Use standard resolutions with auto-config
 2020-05-20 18:15:24 -07:00
Jim
04e6a39de9
Merge pull request #2551 from jpark37/cube-lut-enhance 
Implement CUBE LUT domain properly, tetrahedral interpolation for 3D LUTs
 2020-05-20 18:09:56 -07:00
Jim
2b06495d1b
Merge pull request #2539 from WizardCM/clipping-visual-fix 
UI: Don't clip meters when resizing with no input
 2020-05-20 17:35:00 -07:00
Colin Edwards
78a40f0fc4 obs-vst: Fix crash when the blocksize is smaller than frames 2020-05-20 19:17:39 -05:00
Colin Edwards
bfc2063b1a obs-vst: Compile the vst plugin on linux 2020-05-20 12:32:49 -05:00
Jim
5a6b417fcc
Merge pull request #2506 from Bennik2000/fix_issue_2290 
Show accurate path in Crash dialog
 2020-05-19 23:12:50 -07:00
Bennik2000
5feabfacc8 UI: Fix wrong path in the crash message dialog 
Closes obsproject/obs-studio#2290
 2020-05-19 22:31:06 -07:00
Jim
f1b97b78d6
Merge pull request #2665 from pkviet/srtfix3 
obs-ffmpeg: Fix srt output
 2020-05-19 16:40:25 -07:00
pkv
697563f4db UI: Swap to new srt output 
Redirect non rtmp streaming to ffmpeg-mux instead of previous
ffmpeg-encoded-output which has been removed.
 2020-05-19 16:15:41 -07:00
pkv
91418e901c obs-ffmpeg: Use obs-ffmpeg-mux for mpegts network output 
This replaces the ffmpeg-encoded-output which had serious issues
(missing headers, muxing issues with non compliant mpegts streams) with
an output grafted from obs-ffmpeg-mux.
 2020-05-19 16:15:41 -07:00
jp9000
c165798959 obs-ffmpeg: Move file read error to separate function 
Moves the code that generates a file read error message to its own
function for the sake of cleaning things up a bit.
 2020-05-19 16:10:06 -07:00
pkv
c8ff234255 obs-ffmpeg: Enable mpegts network URL for ffmpeg-mux 2020-05-18 22:18:23 -07:00
Jim
efa9ee0f3d
Merge pull request #2947 from cg2121/script-tabs 
UI: Hide script tabs if no python settings
 2020-05-18 13:04:54 -07:00
Clayton Groeneveld
e9d6847fb6 UI: Hide script tabs if no python settings 2020-05-18 02:50:28 -05:00
Richard Stanway
5ba2d59b3c
Merge pull request #2588 from Vainock/remove-language-region 
UI: Remove language region
 2020-05-17 23:17:23 +02:00
Richard Stanway
c8aec387c3
Merge pull request #2929 from jpark37/wgc-fail-invalidate 
win-capture: Reset WGC fail flag for new window
 2020-05-17 22:15:44 +02:00
jpark37
e933e20b7c win-capture: Ignore cloaked windows 
Fixes issue where there are two window handles for minimized Calculator,
and OBS picks the wrong one.
 2020-05-17 10:45:10 -07:00
jpark37
a4c9554739 libobs-winrt: Fix WGC minimize handling 
Illegal CopySubresourceRegion parameters were sometimes computed when
minimizing and restoring WGC window captures, leading to device loss.

Add robust safeties to ensure that doesn't happen.
 2020-05-14 08:28:33 -07:00
Ben Torell
07ae6b4ca9
Merge pull request #2930 from tt2468/patch-1 
libobs: Return target instead of current in calc_torquef
 2020-05-14 03:14:22 -04:00
tt2468
ba0f8de3a0 libobs: Return target instead of current in calc_torquef 
If the previously calculated torque value is too close to 1.0
(but not considered 1.0), it would be impossible for the TBar to
finish its transition since it returned the old value, causing desync.
 2020-05-13 22:43:11 -07:00
jpark37
477f90620d win-capture: Reset WGC fail flag for new window 
WGC will give up on a window that it fails to capture, but that
shouldn't stop it from attempting to capture new windows.

Fixes #2928.
 2020-05-13 07:54:41 -07:00
jp9000
7993179466 cmake: Add cmake folders 2020-05-13 06:52:37 -07:00
jpark37
30f6870b23 win-capture: Fail on unsupported Vulkan formats 
Don't allow unsupported Vulkan formats to fall back to B8G8R8A8.
Probably better to fail completely than do an illegal copy.

Also remove bad conversion for VK_FORMAT_A2R10G10B10_UNORM_PACK32.
Red and blue channels were reversed, and there's no DXGI equivalent.

Addresses #2796. We can do more later if justified.
 2020-05-12 12:06:03 -07:00
jp9000
42bbca3d4b UI: Restore theme if settings window exit with [x] 
Fixes a bug where if the theme was changed, then wasn't saved, and the
user exits the window with the [x] button, then chooses "No" when asked
to save settings, it would not restore the original theme.
 2020-05-12 10:10:58 -07:00
Joel Bethke
0b6cc39510
Merge pull request #2910 from jpark37/unlog-com-success 
libobs: Remove log entry for CoInitializeEx pass
 2020-05-11 16:54:50 -05:00
jpark37
0a700dbc2a libobs: Remove log entry for CoInitializeEx pass 
Remove entry from the top of the log. Always returns S_FALSE, and that's
unlikely to change.
 2020-05-10 12:36:20 -07:00
Jim
63cbcc5dcc
Merge pull request #2900 from jpark37/fix-posix-events 
libobs/util: Fix POSIX event bugs
 2020-05-09 16:00:27 -07:00
Jim
84284fe0ff
Merge pull request #2896 from jpark37/reserve-logic-fix 
libobs: Fix da_reserve early return logic
 2020-05-09 15:59:06 -07:00
Jim
0c71a9c3f9
Merge pull request #2895 from jpark37/mac-resize 
mac-capture: Use resize instead of reserve
 2020-05-09 15:58:46 -07:00
jpark37
7ce30ece82 libobs/util: Fix POSIX event bugs 
Handle spurious wakeups, and ensure mutex unlock.
 2020-05-09 14:21:35 -07:00
jpark37
7dc2782840 libobs: Fix da_reserve early return logic 
Test desired capacity against original capacity instead of size.
 2020-05-09 09:15:02 -07:00
jpark37
3d6bec6d2d mac-capture: Use resize instead of reserve 
Better practice for the tracked size to be nonzero.

This does NOT speed up window capture significantly.
 2020-05-09 09:12:48 -07:00
Jim
cc39efc6a4
Merge pull request #2712 from khng300/freebsd-oss-audio 
plugins: Add oss-audio input support
 2020-05-07 06:56:45 -07:00