starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-26 09:21:55 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,636 Commits 20 Branches 255 Tags
82797eb367d73a8694a987cb17c3ea5436e765df
Commit Graph
7636 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jpark37 82797eb367 libobs: Make ComPtr header self-sufficient 
Don't make someone else define IUnknown.
 2020-02-22 21:02:33 -08:00
Richard Stanway 862f16285f libobs: Don't strip whitespace from config values 
A plugin that saves whitespace-only data would crash OBS on startup as
the whitespace stripping would send the string length negative. While
that bug is fixed in this commit, there is also no good reason that OBS
is stripping whitespace to begin with. All data going into the configs
should be well formed and some plugins legitimately wish to save
whitespace as a config option (eg for search / replace characters).
 2020-02-23 04:02:42 +01:00
Richard Stanway ee4cbb1199 obs-outputs: Properly reset stream count on RTMP_Close 
Every addStream call would increment this counter. After merging the
mbedTLS fixes, we no longer have extraneous RTMP_Init calls which were
masking the prescence of this bug. This caused every stream after the
first stream to have the wrong channel index, and eventually OBS would
crash due to an out of bounds write if the counter reached
RTMP_MAX_STREAMS.
 2020-02-23 01:04:14 +01:00
Richard Stanway 28cdebdc9e UI: Don't set audio encoder track index in Adv Output 
The audio track should always be 0 for RTMP output. The previous code
accidentally used the audio track index to set the encoder track index.
If the chosen audio track was track 2, this enabled the experimental
multi-track RTMP output code. This then caused streams to fail as if
there were network problems, as popular RTMP services like Twitch don't
understand the multi-track RTMP stream and the connection hangs.
 2020-02-23 01:04:04 +01:00
Jim 2f22139670 Merge pull request #2419 from cg2121/update-id 
obs-scripting: Update text source IDs
 2020-02-22 04:02:20 -08:00
Clayton Groeneveld 44bb7e690b obs-scripting: Update text source IDs 2020-02-21 22:54:34 -06:00
Jim d93951e11e Merge pull request #2413 from whalebonetv/whalebone 
rtmp-services: Add Whalebone.tv
 2020-02-21 05:43:20 -08:00
jp9000 1f6f183a02 win-ivcam: Fix build issue with CMake 3.16 
There is no 'data' dir for this plugin, so don't attempt to copy it.
 2020-02-21 00:02:01 -08:00
jp9000 61fd81f7b4 image-source: Increase slideshow limit to 400MB 
Increases the image slideshow size limit -- this is a temporary solution
until a newer revision of the image slideshow can be written.
 2020-02-19 02:27:54 -08:00
Stanislav Izotov 8839c9da58 rtmp-services: Add Whalebone.tv 2020-02-19 10:57:06 +01:00
jp9000 11eafbda35 obs-ffmpeg: Mark FFmpeg NVENC as internal 
Because we implemented the fallback for rescaling, there's no need to
show FFmpeg NVENC anymore.
 2020-02-18 21:37:51 -08:00
jp9000 4f6b4df17e UI: Hide encoder if marked internal 
(This commit also modifies libobs)

Hides encoders that are marked as internal.  Same general functionality
as DEPRECATED but not actually deprecated, just internal-only.
 2020-02-18 21:37:41 -08:00
jp9000 cce734a0aa UI: Allow rescaling for texture-based encoders 2020-02-18 21:00:57 -08:00
jp9000 55d80e82e1 obs-ffmpeg: Fall back to FFmpeg nvenc if recale active 2020-02-18 21:00:30 -08:00
jp9000 de363d3e09 libobs: Add obs_encoder_scaling_enabled() 
Returns whether rescaling is enabled for an encoder.  This will be used
with texture-based encoders to determine whether to fall back to
RAM-based encoding instead.
 2020-02-18 20:58:58 -08:00
Jim 4d0b3efc23 Merge pull request #2408 from cg2121/restart-app 
UI: Restart program when audio/locale changed
 2020-02-17 21:37:29 -08:00
Jim fe092d15e5 Merge pull request #2412 from cg2121/decklink-fix 
decklink: Fix crash when no outputs are available
 2020-02-17 21:30:48 -08:00
Jim 262975401e Merge pull request #2411 from cg2121/fix-locked-source 
UI: Fix locked sources being transformed
 2020-02-17 21:30:22 -08:00
Jim 596c8ecef7 Merge pull request #2409 from cg2121/lock-volume 
UI: Add ability to lock volume
 2020-02-17 21:30:01 -08:00
Clayton Groeneveld daf552096e decklink: Fix crash when no outputs are available 2020-02-17 18:58:26 -06:00
Colin Edwards 53e01617c9 CI: Add github workflow to tag merge conflicts 2020-02-17 13:48:07 -06:00
Clayton Groeneveld d6969d7732 UI: Fix locked sources being transformed 2020-02-17 13:22:00 -06:00
Clayton Groeneveld b3601681b8 UI: Add ability to lock volume 2020-02-16 18:33:46 -06:00
Clayton Groeneveld e0135823ce UI: Restart program when audio/locale changed 2020-02-16 16:12:00 -06:00
Jim fd244a6896 Merge pull request #2403 from WizardCM/dock-context 
UI: Use OBS dock menu instead of Qt dock context menu
 2020-02-16 09:52:47 -08:00
Matt Gajownik 8a0cfc5665 UI: Use OBS dock menu instead of Qt dock context menu 2020-02-16 09:37:39 -08:00
Jim 7f373edbea Merge pull request #1956 from VodBox/advanced-importer 
UI: Add advanced scene collection importer
 2020-02-16 09:32:09 -08:00
VodBox 191165c721 UI: Add advanced scene collection importer 
This replaces the previous Open File dialog for importing collections
with a window for importing many collections at once, based on the remux
window, along with support for importing from OBS Classic, XSplit
Broadcaster and from Streamlabs' fork. This also translates sources
between OSes that Studio supports.
 2020-02-16 17:56:06 +13:00
Jim d13f204488 Merge pull request #2257 from Xaymar/fix-remove_by_name-corruption 
libobs: Don't corrupt obs_properties in ..._remove_by_name
 2020-02-15 20:03:58 -08:00
Jim 46b652ad2d Revert "mac-vth264: Manually mark priority bits for frames" 2020-02-15 19:52:02 -08:00
Jim da326f63f5 Merge pull request #2402 from WizardCM/mouse-hotkey-resize 
UI: Allow resizing docks when hotkeys are disabled
 2020-02-13 23:40:42 -08:00
Richard Stanway 42ed6ffffb UI: Fix preview not being disabled when minimized 2020-02-13 23:18:40 +01:00
jp9000 6970cc32c2 libobs: Remove unused variable 2020-02-12 18:31:18 -08:00
jp9000 ff22c20019 libobs: Fix audio keyframe issue 
Audio packets are always considered keyframe packets, so if they weren't
already, mark them as keyframe packets.
 2020-02-12 18:27:42 -08:00
Matt Gajownik a77c6aafde UI: Allow resizing docks when hotkeys are disabled 
Fixes #2194
 2020-02-13 12:28:48 +11:00
Jim 677ac95b80 Merge pull request #2394 from cg2121/media-source-callbacks 
obs-ffmpeg: Use callbacks when starting/ending
 2020-02-12 10:53:54 -08:00
Jim c2c7419e5f Merge pull request #2400 from wahajdar/rtmp-services-Updating-Castr.io-ingests 
rtmp-services: updating castr.io rtmp ingests
 2020-02-12 10:53:31 -08:00
Jim 695ec9c959 Merge pull request #2399 from tlivegaming/master 
rtmp-services: Add Madcat
 2020-02-12 10:53:02 -08:00
Jim d1a4208734 Merge pull request #2397 from PivanInteractive/master 
rtmp-services: Uncanny.gg
 2020-02-12 10:52:42 -08:00
tlivegaming 7c4056e4c1 rtmp-services: Add Madcat 2020-02-12 15:11:17 +08:00
Wahaj Dar c6b1f0fa64 rtmp-services: updating castr.io rtmp ingests 2020-02-12 12:06:34 +05:00
jake-shomer 955db2986f rtmp-services: Uncanny.gg 2020-02-11 18:09:07 -07:00
Clayton Groeneveld 0b3a1711d0 obs-ffmpeg: Use callbacks when starting/ending 2020-02-10 23:49:05 -06:00
Jim 0f272de065 Merge pull request #2393 from cg2121/simplify-media-code 
deps/media-playback: Simplify seek/time code
 2020-02-10 21:36:06 -08:00
Clayton Groeneveld 9730b270a7 deps/media-playback: Simplify seek/time code 2020-02-10 23:03:04 -06:00
jp9000 94d4bfdb1c libobs: Restore order 2020-02-09 18:36:58 -08:00
Jim 1b463bcbbb Merge pull request #2391 from DDRBoxman/cifix 
CI: Fail osx and linux on build failures. Fix decklink clang-format
 2020-02-09 18:33:25 -08:00
Colin Edwards fadbbc9588 CI: Fail osx and linux on build failures. Fix decklink clang-format 2020-02-09 20:02:13 -06:00
Jim 82c3b3c817 Merge pull request #2392 from tbodt/mac-panels-fix 
UI: Add missing function delcaration
 2020-02-09 17:47:46 -08:00
Theodore Dubois c5b0da7d13 UI: Add missing function declaration 
This broke the build, but due to an issue with CI this was not caught by
CI.
 2020-02-09 17:25:31 -08:00