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,429 Commits 20 Branches 255 Tags
4df9ce0cdf3f4d374a633dcf1892e56dfd646352
Commit Graph
7429 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jim 96f00cdffc Merge pull request #2141 from cg2121/t-bar 
Add t-bar to studio mode
 2019-12-27 17:48:23 -08:00
jp9000 4428492e96 UI: Fix scene/source list item spacing 2019-12-27 17:28:14 -08:00
Clayton GroeneveldandJim 68d88fa4c6 UI: Add t-bar to studio mode 
Co-authored-by: Jim <obs.jim@gmail.com>
 2019-12-27 16:41:28 -08:00
jp9000 2d35f863da libobs: Add manual transition "torque" support 
Allows the ability for manual transitioning to smoothly flow
(interpolate) to the intended transition point over a short period of
time rather than simply setting a hard transition point number.  Doing
this allows manual transitioning to occur more smoothly, and in a more
visually pleasant way.
 2019-12-27 16:38:20 -08:00
Clayton GroeneveldandJim a97039db64 libobs: Add manual transitioning support (T-bar) 
Allows the ability to manually specify the transitioning point so the
user can transition at a custom rate, usually done by a device that can
be used as a T-bar

Co-authored-by: Jim <obs.jim@gmail.com>
 2019-12-27 16:38:20 -08:00
Jim ef116f9e5f Merge pull request #2267 from exeldro/advAudioAll 
UI: add option to show all sources to adv audio dialog
 2019-12-27 13:02:47 -08:00
Exeldro 7f395c14b6 UI: Add Active/Inactive status to adv audio props 
Allows the ability to see whether an audio source listed in advanced
audio properties is currently active or inactive (i.e. in an inactive
scene)
 2019-12-27 11:44:29 -08:00
Exeldro 9f8dc0e218 UI: Add "Active Sources Only" option to adv audio props 
Allows the ability to modify the properties of inactive audio sources
which may in scenes other than the one that is currently active.
 2019-12-27 11:15:38 -08:00
jp9000 a6871b2c1d UI: Add setThemeID to qt-wrappers 
Makes the function usable outside of just window-basic-stats.cpp.
 2019-12-27 10:54: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 b5da04242c Merge pull request #2263 from ratwithacompiler/scripting_matrix 
deps/obs-scripting: Expose matrix3 & 4 to scripting
 2019-12-25 07:57:01 -08:00
Rat 83fdf41e3f deps/obs-scripting: Expose matrix3 & 4 to scripting 
Various functions available in the scripting API aren't usable
currently since you can't create the matrix3 and matrix4 needed
for their arguments.
 2019-12-25 00:37:31 +01:00
jp9000 213c715f3d UI: Fix compile issue 2019-12-23 16:13:13 -08:00
Jim 1d65bfb50f Merge pull request #2068 from cg2121/adv-audio-percent 
UI: Add option to use percent instead of dB
 2019-12-23 15:32:46 -08:00
Clayton Groeneveld a2298f3f94 UI: Add option to use percent instead of dB 2019-12-23 14:57:32 -08:00
Jim c25d53c418 Merge pull request #2259 from jpark37/increase-frame-queue 
libobs-d3d11: Increase the frame queue capacity
 2019-12-19 12:16:16 -08:00
jpark37 b5b6f24d5b libobs-d3d11: Increase the frame queue capacity 
Sometimes Present stalls are seen when multiple swap chains are active.
This seems to fix that.
 2019-12-19 10:08:21 -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
Jim 73e62a21a7 Merge pull request #1815 from grimmy/v4l-controls 
linux-v4l2: add support for controls
 2019-12-18 11:33:47 -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
jp9000 2a1a76b3f1 libobs: Update version to 24.0.6 2019-12-17 12:16:52 -08:00
Jim 4b3fbb3062 Merge pull request #2253 from SCG82/fix-qtnetwork 
CI: Fix QtNetwork in Mac packaging script
 2019-12-16 11:58:18 -08:00
SCG82 b7a88f7ac8 CI: Fix QtNetwork in Mac packaging script 2019-12-16 04:37:16 -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
jpark37 8f6984e345 libobs: Add support for volume textures 
Also fix some mip calculations along the way.
 2019-12-15 14:38:26 -08:00
Jim fc93bddb8b Merge pull request #2247 from VodBox/missing-theme-fix 
UI: Ensure OBS launches when theme is missing
 2019-12-15 13:04:25 -08:00
VodBox 798556c068 UI: Ensure OBS launches when theme is missing 
This change makes it so OBS will still launch even if a theme is
missing. This change also deprecates the "CurrentTheme" config key, and
is replaced by "CurrentTheme2".

This is because a previous change to make sure OBS fell back to the
System theme in case of a missing theme had been accidentally removed.
Changing the key prevents a new version of OBS setting a theme that
doesn't exist in an older version, which would prevent that version from
launching.
 2019-12-16 08:12:57 +13:00
Jim 745a65dc49 Merge pull request #1937 from YellowOnion/master 
obs-qsv: Add all target usage options
 2019-12-15 07:13:28 -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
Jim 462ca9d0fe Merge pull request #2245 from AlexanderKozhevin/alexpolymath_youstreamer 
rtmp-services: Add YouStreamer
 2019-12-14 13:32:26 -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 3d0112a225 Merge pull request #2244 from SCG82/fix-package-app 
CI: Fix error deleting QT network framework on OSX
 2019-12-14 12:34:08 -08:00
SCG82 0273db7afc CI: Fix error deleting QT network framework on OSX 2019-12-14 04:32:58 -08:00
Jim 9f819947a4 Merge pull request #2243 from SCG82/fix-mbedtls-id 
CI: Fix mbedtls id in mac deploy script
 2019-12-14 02:53:45 -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
SCG82 de4ceb054c CI: Fix mbedtls id in mac deploy script 2019-12-14 01:34:06 -08:00
Colin Edwards 7a19356099 Merge pull request #2242 from DDRBoxman/hotkey 
libobs: Null check hotkey device on macos
 2019-12-13 23:37:56 -06:00
Colin Edwards 483dd9f2aa Merge pull request #2236 from DDRBoxman/symlinks 
CI: Fix framework symlinks when building osx app
 2019-12-13 23:37:33 -06:00
Colin Edwards 1819696198 libobs: Null check hotkey device on macos 2019-12-13 23:26:34 -06: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
jp9000 e2fa510436 UI: Add save button next to replay buffer button 
Allows the ability to save replays with a button rather than with the
keyboard if desired.

Closes obsproject/obs-studio#1954
 2019-12-12 17:59:20 -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
Colin Edwards 6096d23632 CI: Fix up QT network framework on OSX 2019-12-11 23:04:51 -06:00
Colin Edwards effcdc04d2 CI: Fix osx executable path in plist 2019-12-11 18:25:54 -06:00
Colin Edwards 43f9f45f8f CI: Fix framework symlinks when building osx app 2019-12-11 17:32:04 -06:00
Yves Dionne 2841dfc6db obs-ffmpeg: Enable VAAPI Rate Control 
Enable choosing CBR, CQP and VBR.
 2019-12-11 17:16:29 -05:00
Jim d3b6f7a71f Merge pull request #2203 from JohannMG/streaming-start-validation 
UI: Streaming Settings Validation On Stream Start & User Help
 2019-12-11 02:28:54 -08:00
JohannMG b78cdc910b UI: Add Start Streaming settings check on start 
When we use the server error to respond to user's failing to start a
stream it is slow to return an error and unclear to the user what went
wrong. This diff introduces a simple settings check before attempting
to stream and catch and explain specific URL/key issues to the user.

In the case of preset services we check there is a Stream Key before
attempting to start a stream.

In the case of "custom" we only verify there is a URL since for some
services that's all that is required or the user may use user/password
authentication.
 2019-12-11 01:50:41 -08:00