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

2231 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Jim
44dc06ede4
Merge pull request #2336 from cg2121/fix-warnings 
libobs, obs-x264: Fix compiler warnings
 2020-01-22 00:42:23 -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
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
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
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
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
Jim
1b3525e66a
Merge pull request #2291 from jpark37/cube-lut 
Cube LUT file support
 2020-01-13 16:10:40 -08:00
jpark37
5306f56e89 obs-filters: Add Cube LUT samples 2020-01-12 20:02:33 -08:00
jpark37
4ea7424ebb obs-filters: Add Cube LUT file support 
Tested Cube LUT examples from Photoshop, Adobe spec, and some homebrew.

I don't know how to use the domain fields, so they are being ignored.
 2020-01-12 20:02:24 -08:00
Kurt Kartaltepe
4d89123cdc librtmp: Allow partial success for mbedtls 
mbedtls_x509_crt_parse_path returns a positive number if it partially
succeeds and a negative number on complete failure. This changes the
positive result to no longer error and prevent TLS connections (OBS
verifies all endpoints so having no CA chain prevents TLS).
 2020-01-12 13:31:39 -08:00
Florian Zwoch
2699bbbd77 obs-outputs: Fix mbedtls use of deprecated functions 
mbedtls_md5_starts(), mbedtls_md5_update() and mbedtls_md5_finish()
have been marked deprecated since mbedtls version 2.7 and may go
away in the future.

These function have been superseded by versions with a return
value. They are suffixed with "_ret". We do not actually check
return values.

Also the header "mbedtls/net.h" has been superseded by
"mbedtls/net_sockets.h".
 2020-01-08 11:45:55 +01:00
derrod
3d091d5eeb rtmp-services: Update/remove services 
- Mixer OSL removed (NXDOMAIN)
- Restream.io Prague added (FTL & RTMP)
- GameTips.tv removed (NXDOMAIN on all servers)
 2020-01-08 04:55:38 +01:00
jpark37
2c10f237a0 mac-vth264: Fix encoder list leak 
Instruments claims there are still more around here, but they look
internal with my limited Mac knowledge.
 2020-01-04 09:46:09 -08:00
jpark37
55d47bed0d obs-ffmpeg: Fix VC++ warnings 2020-01-03 09:32:07 -08:00
Kacper Geisheimer
a5fc8ab63b rtmp-services: Add show-it.tv 2019-12-30 23:09:36 +01:00
Jim
4df9ce0cdf
Merge pull request #2251 from jpark37/lut-volume-texture 
Use volume textures for LUT filter
 2019-12-29 11:04:20 -08:00
jpark37
f452bfeedd obs-filters: Add grayscale LUT image 
Not sure what effect black_and_white.png is going for. Add grayscale.png
to try to make it clear that the other image shouldn't be used for
desaturation.
 2019-12-26 09:41:47 -08:00
Jim
0d45f4d577
Merge pull request #1748 from boxerab/ffmpeg-streaming 
obs-ffmpeg: UI and back-end for obs-encoded streaming over various protocols such as SRT
 2019-12-18 12:54:10 -08:00
Gary Kramlich
cbe1791362 linux-v4l2: Add support for controls 
Video4Linux exposes controls for capture devices.  This commit adds
those controls to the properties window for v4l2-input devices.
 2019-12-18 09:22:05 -08:00
jpark37
e4d8eaa1bc obs-filters: Use volume texture for LUT 
Simplifies shader calculations. Not much perf gain, but GPA shows
bottleneck shift from Shader Execution to Sampler as expected.
 2019-12-15 14:38:32 -08:00
Daniel Hill
b9ad1ceb64 obs-qsv11: Add all TargetUsage values 
Using terminology from FFmpeg reference, implement:
https://www.intel.com/content/dam/www/public/us/en/documents/white-papers/cloud-computing-quicksync-video-ffmpeg-white-paper.pdf
 2019-12-15 05:20:49 -08:00
Alexander Kozhevin
c11a30e02a rtmp-services: Add YouStreamer 
(This commit also modifies the UI module)
 2019-12-14 12:54:31 -08:00
Jim
9ebc3d1352
Merge pull request #2220 from dionney/rate_control_vaapi 
obs-ffmpeg: Enable VAAPI Rate Control
 2019-12-14 02:11:02 -08:00
Jim
68bedcf1a9
Merge pull request #2240 from JohannMG/new-fb-bitrate 
rtmp-services: Increase FB max bitrate to 6Mbps
 2019-12-13 11:41:16 -08:00
jp9000
eed1a603d1 obs-browser: Disable system flash 2019-12-13 07:04:26 -08:00
JohannMG
0e6afafa67 rtmp-services: Increase FB max bitrate to 6Mbps 
Facebook Live now recommends 6000kbps for most streamers and the auto
capping is clamping users to 4000kpbs. This fixes the new suggested
setting.
 2019-12-12 17:24:45 -08:00
Yves Dionne
2841dfc6db obs-ffmpeg: Enable VAAPI Rate Control 
Enable choosing CBR, CQP and VBR.
 2019-12-11 17:16:29 -05:00
Kraz3D
d34ad717b8 rtmp-services: Add Konduit.live 2019-12-10 08:53:06 -08:00
jpark37
3f58810b0e libdshowcapture: Update to latest submodule 2019-12-08 14:52:00 -08:00