Commit Graph

7409 Commits (0d45f4d577ae200dcb7013075872755101e90838)

Author SHA1 Message Date
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
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
JohannMG c4396e03a7 UI: Create UI Validation Helper Class
Pull UI validation and its helpers to their own class. This class will
be used to validate forms and perform UI-action checks such as
checking stream keys aren't empty and in this diff now holds the logic
to ensure there is a source before the person starts a stream.
2019-12-11 01:23:36 -08:00
Jim bcddf4ddbf
Merge pull request #2211 from VodBox/scene-grid-mode
UI: Add Grid Mode to Scenes Widget
2019-12-10 14:57:26 -08:00
Jim d5878d5e75
Merge pull request #2232 from Kraz3D/master
rtmp-services: Add Konduit.live
2019-12-10 09:27:10 -08:00
jp9000 c1522019e0 libobs: Do not include unrelated flags in filter check
Closes obsproject/obs-studio#2224
2019-12-10 09:22:18 -08:00
Kraz3D d34ad717b8 rtmp-services: Add Konduit.live 2019-12-10 08:53:06 -08:00
jp9000 2224ddff61 libobs: Update version to 24.0.5 2019-12-10 00:06:27 -08:00
Colin Edwards bfb6d50556 CI: Don't run clang format on some submodule plugins 2019-12-09 23:52:59 -08:00
Jim 877b1815c3
Merge pull request #2230 from jpark37/allow-theme-reload
UI: Allow switch to existing theme to reload
2019-12-09 00:37:07 -08:00
Jim 984d35bf9d
Merge pull request #2231 from jpark37/dshow-module
libdshowcapture: Update to latest submodule
2019-12-08 16:02:56 -08:00
jpark37 3f58810b0e libdshowcapture: Update to latest submodule 2019-12-08 14:52:00 -08:00
jpark37 ecd6753dc7 UI: Allow switch to existing theme to reload
This is useful for people modifying the currently selected theme.
2019-12-08 14:43:23 -08:00
Jim 06f14edf08
Merge pull request #2228 from jpark37/qt-redundant-theme
UI: Don't modify theme if already set
2019-12-07 12:07:31 -08:00
jpark37 bb04c961bc UI: Don't modify theme if already set
This includes reselecting the existing selection, and cancelling out of
settings altogether. Takes a long time (7 seconds) in debug builds.
2019-12-07 10:22:02 -08:00
Jim 5d5afc463f
Merge pull request #2227 from jpark37/decklink-casts
Decklink: Explicit casts for truncation warnings
2019-12-07 02:32:28 -08:00
jpark37 592ff852a5 Decklink: Explicit casts for truncation warnings 2019-12-06 22:35:52 -08:00
Jim 807e7c0855
Merge pull request #2225 from jpark37/remove-c99-hacks
libobs: Remove C99 hacks for older VC++
2019-12-06 21:55:02 -08:00
jpark37 c17397fede libobs: Remove C99 hacks for older VC++ 2019-12-05 18:34:51 -08:00
jp9000 ccb7d897c6 UI: Delete cookies before connecting account
Fixes an issue where when trying to connect a Twitch account, and the
Twitch two-factor authentication check fails, the user will still
technically be logged in because the cookies will still be present, thus
when they try to click the "Connect" button again, it will skip the
login part (because they're already technically logged in), and just
give them the two-factor failure message without letting them enter in
their login information again.
2019-12-05 00:52:39 -08:00
jp9000 cfddf1112b UI: Fix bug in untested/unused function code path
In the current user interface code, OBSBasic::AddSceneCollection has a
qname parameter to allow explicitly specifying a name, but that code
path is unused in the UI code itself, and qname is typically empty.  If
qname is not empty, it does not properly generate a file name associated
with that specified scene collection name.  This fixes that issue.
2019-12-04 15:50:41 -08:00
Jim 5a406201a6
Merge pull request #2216 from emaste/freebsd-ci
CI: Add Cirrus-CI config for FreeBSD builds
2019-12-03 06:51:46 -08:00