starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-27 17:55:42 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,519 Commits 20 Branches 255 Tags
5f62cd153b8954690f22c1bc1a7da40221668da8
Commit Graph
7519 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Richard Stanway 5f62cd153b obs-outputs: Remove unused variable 2020-01-25 19:25:43 +01:00
Richard Stanway baa559813c obs-outputs: Fix build with older mbedtls versions 
Compilation with older versions of mbedtls was broken by
https://github.com/obsproject/obs-studio/pull/2304, unfortunately the
older version is still present in Ubuntu 16 LTS.
 2020-01-25 18:58:05 +01:00
Richard Stanway 7d85aa3180 CI: Add libmbedtls-dev 2020-01-25 18:24:04 +01:00
Richard Stanway 476b727fea obs-outputs: Show UI error if the root certs don't load 
Though this should now be very rare, it's more helpful than "Failed to
connect to server". Other TLS error codes are now also stored for future
use instead of copying them on a case by case basis.
 2020-01-25 17:35:07 +01:00
Richard Stanway 7a4c5e5df2 obs-outputs: Enable logging before calling RTMP_Init 
Errors or warnings in RTMP_Init were not copied to the OBS log file
if they occured before the callback was set.
 2020-01-25 17:01:14 +01:00
Richard Stanway d1159087f1 obs-outputs: Add additional paths for root certificates on Linux 
Fixes https://github.com/obsproject/obs-studio/issues/2350. Also adds
some log file output for when the root certificates can't be loaded to
make it more obvious what the problem is.
 2020-01-25 16:49:11 +01:00
Richard Stanway 2b131d212f obs-outputs: Fix librtmp mbedtls thread safety 
Per mbedtls documentation, "If you share a context between threads, you
need to call these functions only from the main thread, at the beginning
and end of the context's lifetime.". OBS violated this since librtmp
uses a global context and it was allocated and freed in different
threads such as the auto config test.

This commit attaches the mbedtls context to an RTMP structure so there
is no more global state. It also fixes a rare double-free crash that
could occur if RTMP_TLS_Free was called twice (this happened in rare
situations such as the auto config running followed by a mode change
from Advanced to Simple).
 2020-01-23 00:11:23 +01:00
Jim 44dc06ede4 Merge pull request #2336 from cg2121/fix-warnings 
libobs, obs-x264: Fix compiler warnings
 2020-01-22 00:42:23 -08:00
Jim 432770342a Merge pull request #2339 from cg2121/t-bar-fix 
UI: Fix t-bar not working with transition override
 2020-01-22 00:41:38 -08:00
Jim 7414a90d41 Merge pull request #2338 from matticusfinch/patch-1 
rtmp-services: Add Uscreen
 2020-01-22 00:28:08 -08:00
Clayton Groeneveld 95c68fed15 UI: Fix t-bar not working with transition override 2020-01-21 23:53:11 -08:00
Matthew d3cf29dcc2 rtmp-services: Add Uscreen 2020-01-21 15:22:16 -07:00
Clayton Groeneveld 4e3a0180ba libobs, obs-x264: Fix compiler warnings 2020-01-21 15:18:09 -06:00
jp9000 345e933d9f deps/obs-scripting: Fix incorrect parameter type 2020-01-21 02:43:21 -08:00
jp9000 9f1c442d35 UI: Add option to toggle source icons to View menu 2020-01-20 23:19:32 -08:00
Jim 8c549a3223 Merge pull request #2327 from jpark37/srgb-enum-value 
libobs: Add VIDEO_CS_SRGB enum value
 2020-01-20 22:52:57 -08:00
Jim 5e377a9d62 Merge pull request #2333 from jpark37/qt-warnings-5_14 
UI: Fix Qt 5.14 deprecation warnings
 2020-01-20 22:51:10 -08:00
Jim 632c08910d Merge pull request #2332 from jpark37/deprecate-macro 
libobs: Rename DEPRECATED to OBS_DEPRECATED
 2020-01-20 22:50:49 -08:00
jpark37 263bf48baa UI: Fix Qt 5.14 deprecation warnings 
These functions should be available on current Qt.
 2020-01-20 22:13:16 -08:00
jpark37 00f280ff9d libobs: Rename DEPRECATED to OBS_DEPRECATED 
Avoid collisions with other libraries that define DEPRECATED.
 2020-01-20 21:44:50 -08:00
Jim 500111e230 Merge pull request #2329 from exeldro/docs 
docs/sphinx: Add obs_group_from_source and obs_enum_scenes
 2020-01-19 12:13:25 -08:00
Jim a1eeb9ed32 Merge pull request #2328 from cg2121/fix-pulse-crash 
audio-monitoring: Fix Pulse Audio crash
 2020-01-19 12:11:53 -08:00
Exeldro 81b7618926 docs/sphinx: Add obs_group_from_source 2020-01-19 09:22:33 +01:00
Exeldro ec655bbcb9 docs/sphinx: Add obs_enum_scenes 2020-01-19 09:21:53 +01:00
Clayton Groeneveld 6a7260783e audio-monitoring: Fix Pulse Audio crash 2020-01-18 10:46:56 -06:00
jpark37 8134a116be libobs: Add VIDEO_CS_SRGB enum value 
Can't implement all at once because of AMF submodule.
 2020-01-18 08:21:42 -08:00
Richard Stanway 20a2b2523c Merge pull request #2325 from cg2121/color-source-fix 
image-source: Fix color source default size
 2020-01-17 16:34:59 +01:00
Clayton Groeneveld 9ae8e090e0 image-source: Fix color source default size 2020-01-17 07:53:14 -06:00
astudios123 fd206521da rtmp-services: Update SermonAudio entry (#2324) 
We have a new back-end to the SermonAudio webcasting system which required a new URL and now allows for increased bitrates.

Added the "alt_names" to avoid breaking backwards compatibility and ensure that users receive the new ingest URLs.
 2020-01-16 17:48:20 -06:00
Jim 3fe44c6331 Merge pull request #2318 from cg2121/studio-mode-bugs 
UI: Fix studio mode transition bugs
 2020-01-15 16:11:36 -08:00
Jim 36d3a1e3c4 Merge pull request #2317 from kkartaltepe/fallback-sources-dnd 
UI: Support URL/web DnD in linuxbrowser
 2020-01-15 15:55:14 -08:00
jp9000 14f73c92ed Remove Appveyor 
It's taking up CI build time, so just remove it.
 2020-01-15 03:25:08 -08:00
Jim 8c7a6518a4 Merge pull request #2285 from cg2121/source-defaults 
obs-plugins: Change defaults of various plugins
 2020-01-15 03:19:14 -08:00
Jim 1bfe461473 Merge pull request #2256 from JohannMG/fix-wizard-key-link 
UI: Upgrade stream key link to button in Wizard
 2020-01-15 02:39:59 -08:00
Clayton Groeneveld 6a282360f0 obs-text: Change default size of text to 256 2020-01-15 02:18:33 -08:00
Clayton Groeneveld b5d2d26b5b text-freetype2: Change default size of text to 256 2020-01-15 02:17:52 -08:00
Clayton Groeneveld fd1a107436 image-source: Change default size to size of canvas 2020-01-15 02:17:09 -08:00
jp9000 70582174c3 libobs: Add the ability to make sources obsolete 
This allows the ability to do things such as change defaults or
properties of sources without necessarily breaking older user
configurations that had older defaults or properties.
 2020-01-15 01:49:18 -08:00
Clayton Groeneveld f7d39c12c0 UI: Fix studio mode transition bugs 
-If the user were in the middle of a transition and clicked
the cut transition, the transitions would become borked.

-This actually disables the transition widgets, so the
user doesn't click them. Before, the disabling of the
widgets didn't work as expected. The code for enabling/disabling
them was also simplified.

-This loading of studio mode was moved in OBSInit because
the loading of transitions needs to happen first. This fixes
a bug when enabling/disabling the t-bar when the program
is first loaded. The t-bar would be disabled even if a
cut or stinger transition was not used.

-When the user would click the quick transitions, the
t-bar would be enabled even when it was not supposed
to.
 2020-01-14 01:29:23 -06:00
Jim 37a7805ad5 Merge pull request #2319 from jpark37/rgb-dib 
win-dshow: Fix upside-down RGB DIBs
 2020-01-13 22:35:02 -08:00
jpark37 9eeef48b5a win-dshow: Fix upside-down RGB DIBs 
Fix regression to RGB DIB orientation according to MSDN.
 2020-01-13 21:50:54 -08:00
Kurt Kartaltepe aeed4a3aa1 UI: Support DnD overlay in linuxbrowser 
Add support for checking multiple source types in Drag n Drop callback
to support overlays for linuxbrowser users. Once the "browsersource" is
available on the platform it will have priority.
 2020-01-13 19:20:54 -08:00
Jim 1b3525e66a Merge pull request #2291 from jpark37/cube-lut 
Cube LUT file support
 2020-01-13 16:10:40 -08:00
Jim c485ad700b Merge pull request #2273 from WizardCM/drag-drop-urls 
Support for URL/web link drag and drop
 2020-01-13 07:40:34 -08:00
jp9000andMatt Gajownik 5f830522a2 UI: Add drag and drop for URLs 
Co-authored-by: Matt Gajownik <matt@wizardcm.com>
 2020-01-13 03:09:30 -08:00
Matt Gajownik 505d321840 UI: Make dropped HTML files use canvas size 2020-01-13 03:03:33 -08:00
Jim fbc2d9c87e Merge pull request #2314 from kkartaltepe/tls-continue 
librtmp: Allow partial success for mbedtls
 2020-01-13 02:10:26 -08:00
Jim c6053c3d96 Merge pull request #2312 from cg2121/fix-audio-message 
UI: Fix audio restart message not hiding
 2020-01-13 02:02:25 -08:00
Jim e338b44ab5 Merge pull request #2305 from cg2121/aspect-ratios 
UI: Display aspect ratios in video settings
 2020-01-13 02:01:34 -08:00
jpark37 5306f56e89 obs-filters: Add Cube LUT samples 2020-01-12 20:02:33 -08:00