starred/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-09-26 17:30:32 -04:00
Code Issues Packages Projects Releases Wiki Activity
7,553 Commits 20 Branches 255 Tags
0c4bdde153a8095ce45d4b0981046ed76ecccc2d
Commit Graph
7553 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim 0c4bdde153 Merge pull request #2365 from cg2121/media-stuff 
obs-ffmpeg, vlc-video: Add media control support
 2020-02-05 11:52:02 -08:00
Clayton Groeneveld abcff0073c obs-ffmpeg: Add media hotkeys 2020-02-05 08:14:51 -08:00
Clayton Groeneveld 68f8206877 obs-ffmpeg: Add media control support 2020-02-05 08:14:49 -08:00
Clayton Groeneveld 1e244d7d49 vlc-video: Add media control support 2020-02-05 08:14:18 -08:00
Jim 86d3eb3088 Merge pull request #2357 from obsproject/librtmp-thread-safety 
obs-outputs: Various librtmp mbedtls fixes
 2020-02-03 08:29:53 -08:00
VodBox d1b6a04afc libobs/util: Fix incorrect assertion in darray_insert_array 
Previously the assertion required the idx to be smaller than the number
of elements in the darray. This would mean you could not insert anything
at the end of a darray, and would make it impossible to insert an array
into an empty darray.
 2020-02-03 10:44:15 +13:00
jp9000 f077004523 UI: Fix incorrect parameter 
This param is the buffer size, including null terminator
 2020-02-01 22:10:57 -08:00
jp9000 3f9ca9644a UI: Fix incorrect parameter value 
The last parameter is the buffer size (which would include null
terminator), not the desired string length.
 2020-02-01 21:51:21 -08:00
jp9000 65d38864b6 deps/media-playback: Fix formatting 2020-02-01 21:51:20 -08:00
Jim 1ea563cb2f Merge pull request #2366 from WizardCM/stinger-halve-padding 
obs-transitions: Halve stinger padding to 250ms
 2020-01-31 15:34:28 -08:00
Matt Gajownik 061793b975 obs-transitions: Halve stinger padding to 250ms 
Triggering a new transition too soon after a
stinger would cause the wrong scene to be displayed
 2020-02-01 09:50:57 +11:00
Jim 23ec9fd2b0 Merge pull request #2274 from cg2121/libobs-media-controls 
libobs: Add media control support to backend
 2020-01-30 22:25:08 -08:00
Clayton Groeneveld f9ccea5235 libobs: Add media control support to backend 2020-01-30 21:40:20 -08:00
Jim 4cae7c55a1 Merge pull request #2300 from cg2121/media-pause-seek 
media-playback: Add functions to pause/seek media source
 2020-01-30 18:30:36 -08:00
Jim fd27dcc2e9 Merge pull request #2358 from cg2121/fix-res-lineedit 
UI: Use input validator on resolution line edit
 2020-01-30 12:35:18 -08:00
Jim 80b5e39d38 Merge pull request #2359 from cg2121/transition-enabled-fix 
UI: Fix transtions not enabled
 2020-01-30 12:28:09 -08:00
Richard Stanway c465212414 obs-outputs: Remove hard-coded certificate paths on Linux 
The report in https://github.com/obsproject/obs-studio/issues/2350
identified the issue as being caused by mbedtls not following symbolic
links, but it turns out the issue was the mbedtls_x509_crt_parse_path
return value which was already fixed in 4d89123c. So these changes are
no longer necessary.
 2020-01-30 19:48:23 +01:00
jp9000 f7cf707ea5 mac-capture: Fix redundant call 2020-01-30 06:46:33 -08:00
Clayton Groeneveld 0700c9eae1 UI: Fix transtions not enabled 2020-01-29 02:04:45 -06:00
Clayton Groeneveld a86912f0db UI: Use input validator on resolution line edit 2020-01-28 00:45:18 -06:00
jp9000 3aa08c4e0f libobs: Add obs_scene_find_source_recursive 
Same as obs_scene_find_source but also searches groups within the scene.
 2020-01-27 14:36:53 -08:00
Jim 818e3a364e Merge pull request #2345 from cg2121/fix-res-crash 
UI: Fix crash when entering large resolutions
 2020-01-27 06:57:32 -08:00
Jim a5b3e8ee23 Merge pull request #2335 from jpark37/amf-bump 
enc-amf: Update to latest
 2020-01-27 04:43:25 -08:00
Jim d60fb8dcbc Merge pull request #2351 from WizardCM/named-stinger-media 
Set stinger media source's name
 2020-01-27 04:38:56 -08:00
Clayton Groeneveld 765bb34641 UI: Don't allow resolutions too large 
Fixes a crash when entering large resolutions, and also works as a minor
sanity check against bad resolution values.
 2020-01-27 04:34:47 -08:00
Jim 83df7d1635 Merge pull request #2342 from cg2121/aspect-ratio-fix 
UI: Fix aspect ratio triggering settings change
 2020-01-27 04:22:45 -08:00
Jim b88ea35c34 Merge pull request #2341 from FlyGoat/cross-plat 
Add support for MIPS architecture
 2020-01-27 04:22:13 -08:00
Richard Stanway 2f4447a7a1 obs-outputs: Remove server support from librtmp 
This code is very old and seems to be non-functional in its current
state. The TLS support is also complicated to maintain across multiple
deprecated mbedtls functions.
 2020-01-25 19:31:48 +01:00
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
Matt Gajownik 56d25fe6a8 obs-transitions: Set stinger media source's name 2020-01-25 17:27:16 +11:00
jpark37 8cd22d4fb2 enc-amf: Update to 2.7.0 2020-01-22 20:24:31 -08: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
Clayton Groeneveld 46db0c0823 UI: Fix aspect ratio triggering settings change 2020-01-22 12:25:05 -06: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
Jiaxun Yang af062863ab linux-v4l2: Mark aarch64 and mips n64 as known platform 
Aarch64 and MIPS N64 ABI are safe to the uint to long cast.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
 2020-01-22 15:41:30 +08:00
Jiaxun Yang 6366f6ab59 libobs: Build SIMDE on platforms without SSE2 
SIMDE was introduced for aarch64 support, however, the library itself
supports non-SIMD fallback, which allows us provide support to other
platforms without code changes.

There is another world beyond x86. So we can simply enable SIMDE for
processors without SSE2 support.

Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com>
 2020-01-22 15:41:15 +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