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

7690 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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