starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-27 09:46:20 -04:00
Code Issues Packages Projects Releases Wiki Activity
8,405 Commits 20 Branches 255 Tags
3907b2ddd155f2bd8b2288e163383ddd24f0babd
Commit Graph
8405 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim 3907b2ddd1 Merge pull request #3197 from jpark37/vulkan-cts-harden 
win-capture: Improve Vulkan hook stability
 2020-07-24 20:37:26 -07:00
Rodney dc0af42f1b Merge pull request #3091 from derrod/remove-mixer 
UI/CI/rtmp-services: Remove Mixer
 2020-07-24 20:17:38 +02:00
jpark37 44fb61b1f2 win-capture: Improve Vulkan hook stability 
Make fixes mostly to stabilize CTS. Tested on Windows with RTX 2080 Ti.

Use separate linked-list maps for devices and queues.

Process queues upfront in OBS_CreateDevice, and not lazily in
OBS_GetDeviceQueue.

Handle failed node allocation for OBS_CreateInstance, OBS_CreateDevice,
and OBS_CreateSwapchainKHR.

Handle VK_NULL_HANDLE for OBS_DestroySurfaceKHR and
OBS_DestroySwapchainKHR.

Add temporary code path CTS_WORKAROUND to deal with CTS sharing surfaces
between instances.

Fix return value for OBS_DestroyInstance.

Add missing _freea calls, required for _malloca.

Make sure the queue passed to OBS_QueuePresentKHR supports transfer to
safely call vkCmdCopyImage.

Update GetInstanceProcAddr/GetDeviceProcAddr to conform closer to spec.

Remove extra macros because I dislike indirection more than verbosity.
 2020-07-24 09:30:05 -07:00
Richard Stanway 06321f89e1 UI: Remove OBSContext class and shutdown in run_program 
The OBSContext never called obs_startup but would always call
obs_shutdown in its destructor, resulting in shutdown calls even if
libobs wasn't initialized (eg due to a startup error). Instead, we now
track if libobs was initialized in OBSApp and call shutdown in the
destructor.
 2020-07-23 23:17:52 +02:00
Matt Gajownik f9801c933e Merge pull request #3204 from RytoEX/disable-mac-python-02 
CI: Disable Python on macOS
 2020-07-23 20:50:47 +10:00
Ryan Foster 85d58dfefd CI: Disable Python on macOS 
Follow-up to 63373a8fd7
and 2c60aa2abe (PR #3203).
 2020-07-23 01:10:29 -04:00
Joel Bethke 63373a8fd7 Merge pull request #3203 from jpark37/mac-ci-python 
CI: Disable Python for Mac PR automation
 2020-07-22 23:05:52 -05:00
jpark37 2c60aa2abe CI: Disable Python for Mac PR automation 2020-07-22 20:31:59 -07:00
derrod b67a238b7c CI: Remove Mixer cmake variables 2020-07-22 07:47:12 +02:00
derrod b8f91cc4c3 rtmp-services: Remove Mixer servers and checks 2020-07-22 07:47:12 +02:00
derrod db37cc34d5 UI: Remove Mixer integration 2020-07-22 07:47:07 +02:00
jp9000 83913e1d31 deps/media-playback: Don't EOF while paused and seeking 
Fixes a bug where playback would completely stop when manually seeking
to the end of the file. Playback should not officially stop until
playback has unpaused.
 2020-07-21 16:40:33 -07:00
Jim 95401e5794 Merge pull request #3189 from exeldro/preload_paused 
deps/media-playback: Preload video when seeking paused
 2020-07-21 16:39:25 -07:00
Exeldro 7a33167769 deps/media-playback: Preload video when seeking paused 2020-07-20 14:23:13 -07:00
jp9000 3691dc536d win-dshow: Fix virtual camera filter name 
The filter name is supposed to be "OBS Virtual Camera"
 2020-07-20 14:22:49 -07:00
Jim 857c21b3f9 Merge pull request #3195 from cg2121/windows-vcam-fix 
win-dshow: Fix virtual camera enable bug
 2020-07-20 08:00:45 -07:00
Clayton Groeneveld f4223ad061 win-dshow: Fix virtual camera enable bug 2020-07-20 06:02:16 -05:00
jp9000 ae29ec5239 rtmp-services: Fix memory leak 2020-07-19 22:06:34 -07:00
Jim aa0a6526a8 Merge pull request #3177 from cg2121/linux-filedialog 
UI: Use non-native file dialog w/ Linux
 2020-07-19 21:40:52 -07:00
Jim a7ad0087ec Merge pull request #3188 from jpark37/more-ffmpeg-cleanup 
More FFmpeg cleanup
 2020-07-19 21:33:07 -07:00
Jim 4759340d95 Merge pull request #3187 from jpark37/virtual-override-warning 
UI: Fix warning about missing override
 2020-07-19 21:31:20 -07:00
jpark37 ffbc3ed923 obs-ffmpeg: Fix race and deprecation warnings 
Attempt to simply shutdown sequence to avoid race between vidoe and
write threads. Can no longer join on write thread from write thread.

Also use codecpar instead of deprecated codec member.
 2020-07-19 12:49:53 -07:00
jpark37 06e4b10675 libobs/media-io: Add missing codec_tag set 2020-07-18 23:35:35 -07:00
jpark37 f8cae4639e deps/media-playback: Remove unused #define 2020-07-18 23:33:21 -07:00
jpark37 2e7fee8e53 deps/libff: Remove very old version check 2020-07-18 23:32:15 -07:00
jpark37 6c86ff7936 UI: Fix warning about missing override 2020-07-18 23:31:15 -07:00
Jim 6a79657a19 Merge pull request #3185 from jpark37/codec-warnings 
FFmpeg deprecation warnings
 2020-07-18 19:34:23 -07:00
jpark37 be4a859383 obs-ffmpeg: Fix FFmpeg deprecation warnings 2020-07-18 18:47:58 -07:00
jpark37 40b4db0c0c libobs/media-io: Fix FFmpeg deprecation warnings 2020-07-18 18:47:52 -07:00
jpark37 0628c844f8 libobs: Fix FFmpeg deprecation warnings 2020-07-18 18:47:45 -07:00
Jim 8103457cda Merge pull request #3183 from derrod/disable-updater 
UI: Add flag/file to disable built-in updater
 2020-07-18 17:48:51 -07:00
derrod 30862d75ae UI: Add flag/file to disable built-in updater 
When distributing OBS via third party platforms that have their own
update systems we want to be able to disable the OBS updater without
having to resort to having a separate build entirely.
 2020-07-18 21:33:47 +02:00
Jim 1fed223195 Merge pull request #3144 from WizardCM/clickable-script-description 
frontend-tools: Make links in script description clickable
 2020-07-18 11:48:33 -07:00
Matt Gajownik 2ca17e62ce frontend-tools: Make links in script description clickable 2020-07-18 11:14:26 -07:00
Jim cd865a0be8 Merge pull request #3150 from jpark37/vulkan-dynamic-arrays 
win-capture: Remove fixed-size Vulkan arrays
 2020-07-18 10:46:22 -07:00
Jim f7ec6043e2 Merge pull request #3179 from pkviet/coreaudio4 
coreaudio-encoder: Fix encoding of 4.0 speaker layout
 2020-07-18 10:45:36 -07:00
Jim 5537a6ce08 Merge pull request #3180 from venepe/raspberry-pi 
libobs: Add arm support
 2020-07-18 10:28:35 -07:00
Jim 22ea6c5017 Merge pull request #3181 from Dead133/drop-restreamio-ftl-support 
rtmp-services: drop Restream.io FTL support
 2020-07-18 10:20:23 -07:00
Clayton Groeneveld 762983b5d8 UI: Use non-native file dialog w/ Linux 2020-07-18 09:49:24 -07:00
Jim 934cff582a Merge pull request #3175 from cg2121/fix-warnings 
UI, obs-ffmpeg, obs-filters: Fix compile warnings
 2020-07-18 08:32:49 -07:00
Jim 33a928d6db Merge pull request #3172 from PatTheMav/macos-disable-python 
CI: Disable building OBS with Python scripting support on macOS
 2020-07-18 08:31:49 -07:00
Dead133 1a29674840 rtmp-services: drop Restream.io FTL support 2020-07-18 14:16:41 +03:00
venepe f5d877b393 libobs: Add arm support 2020-07-18 00:53:03 -05:00
Clayton Groeneveld 990a07dc18 UI, obs-ffmpeg, obs-filters: Fix compile warnings 2020-07-16 23:15:13 -05:00
pkv 2ab549e1c1 coreaudio-encoder: Fix encoding of 4.0 speaker layout 
For four channels, coreaudio encoder defaults to quad
(FL FR, BL BR).
So 4.0 needs to be explicitly set for the encoder.
 2020-07-17 04:41:06 +02:00
jp9000 56e56cd265 deps/media-playback: Reset TS when seeking 
If seeking occurs too close to the previous time value, it could cause
the playback to delay an abnormal amount of time, or if the time value
is under the previous value, then it would cause an assert.  So instead,
reset the next timestamp value to be instant in both cases if a seek
occurs to ensure timely playback.
 2020-07-16 19:00:01 -07:00
PatTheMav 68d4df9180 CI: Disable building OBS with Python scripting support on macOS 2020-07-16 19:23:20 +02:00
Jim 2ba2df6e59 Merge pull request #3167 from WizardCM/duplicator-log 
win-capture: Log duplicator display when updating properties
 2020-07-15 06:59:51 -07:00
Jim e5151ec4a9 Merge pull request #3168 from PatTheMav/ci-azure-mbedtls-fix 
CI: Add fix for macOS builds failing on push for Azure CI
 2020-07-15 06:58:54 -07:00
PatTheMav 28d8ca3323 CI: Add fix for macOS builds failing on push for Azure CI 2020-07-15 15:25:36 +02:00