mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-04-28 10:28:38 -04:00
Code Issues Packages Projects Releases Wiki Activity
Files
c8a01f92ee9056d118843fbb9a426a47f3e317d8
obs-studio/UI
History
pkv fcb6df1f63 obs-ffmpeg: Direct setting of encryption & auth for SRT & RIST 
Also modifies UI.

This allows the direct use of passphrase (SRT & RIST) used for
encryption, user + password (RIST) as well as streamid (SRT).
Previously, these parameters had to be set in the URL in the form:
URL?option1=value1&option2=value2.
They still can but there is also the option to set them in the stream
key and username/password fields.
SRT:
- the stream_id is set in the stream key (more info on it: [1]);
- the encryption passphrase is set in the password auth field.
RIST:
- the encryption passphrase is set in the stream key;
- the srp_username and srp_password are set in the user/password auth
fields [2].

Additionally, some error logging has been added when there's a
disconnect caused by a wrong password.
Lastly, this solves a bug when auto-reconnect is set and a wrong
passphrase is provided for srt; the output would keep trying to
reconnect. With this commit, an OBS_OUTPUT_INVALID_STREAM signal is
emitted and the stream is immediately stopped.

[1] https://github.com/Haivision/srt/blob/master/docs/features/access-control.md
[2] https://code.videolan.org/rist/librist/-/wikis/Authentication-and-the-ristsrppasswd-Utility

Signed-off-by: pkv <pkv@obsproject.com>
2022-11-17 21:56:38 -05:00
..
data
obs-ffmpeg: Direct setting of encryption & auth for SRT & RIST
2022-11-17 21:56:38 -05:00
forms
UI: Add separator in source toolbar
2022-11-16 18:13:08 +11:00
frontend-plugins
decklink-output-ui: Pipeline GPU data for preview
2022-11-09 18:49:38 -08:00
importers
UI/importers: Fix compiler warning
2022-04-23 16:12:45 -07:00
installer
UI/installer: Update references to dependencies for 28.0.0
2022-08-21 17:26:27 +02:00
nix-update
UI: Fix non-Windows vstrprintf
2022-09-09 23:25:31 -07:00
obs-frontend-api
UI/obs-frontend-api: Return allocated strings for new funcs
2022-10-30 20:35:36 -07:00
win-update
UI/updater: CMake: Add /utf-8 to MSVC command line
2022-09-05 22:51:15 +02:00
xdg-data
UI: Update CMakeLists.txt for main OBS app
2022-03-16 23:11:58 +01:00
adv-audio-control.cpp
UI: Fix compiling error on nix platforms
2022-07-10 14:00:35 +10:00
adv-audio-control.hpp
UI: Fix typo with SetSourceName function
2022-07-10 14:00:35 +10:00
api-interface.cpp
UI/obs-frontend-api: Return allocated strings for new funcs
2022-10-30 20:35:36 -07:00
audio-encoders.cpp
UI: Fix audio ids not being stored properly
2022-03-13 07:05:02 -07:00
audio-encoders.hpp
UI: Fix audio ids not being stored properly
2022-03-13 07:05:02 -07:00
auth-base.cpp
UI: Rework YouTube broadcast setup flow
2021-09-12 13:45:51 +02:00
auth-base.hpp
UI: Rework YouTube broadcast setup flow
2021-09-12 13:45:51 +02:00
auth-listener.cpp
UI: Fix AuthListener error HTTP response body
2021-09-16 15:03:28 +02:00
auth-listener.hpp
UI: Properly verify state parameter for YouTube auth
2021-09-15 06:16:29 -07:00
auth-oauth.cpp
UI: Make OAuth base URL configurable
2022-05-19 09:31:38 -07:00
auth-oauth.hpp
UI: Add support for external browser OAuth
2021-07-24 15:50:59 -07:00
auth-restream.cpp
UI: Make OAuth base URL configurable
2022-05-19 09:31:38 -07:00
auth-restream.hpp
UI: Specify exact service to auth login callbacks
2021-07-24 15:50:59 -07:00
auth-twitch.cpp
UI: Make OAuth base URL configurable
2022-05-19 09:31:38 -07:00
auth-twitch.hpp
UI: Add UUID to Twitch panel URLs
2021-12-11 14:39:19 -08:00
auth-youtube.cpp
UI: Remove compatibility for QT < 5.10
2022-07-31 21:47:01 -07:00
auth-youtube.hpp
UI: Remove compatibility for QT < 5.10
2022-07-31 21:47:01 -07:00
balance-slider.hpp
UI: Add ability to reset sliders when double clicked
2018-09-07 09:27:20 -05:00
clickable-label.hpp
clang-format: Apply formatting
2019-06-23 23:49:10 -07:00
CMakeLists.txt
UI: Force fixed font in plain text edits
2022-08-22 17:26:50 -07:00
context-bar-controls.cpp
UI: Add application audio capture to toolbar
2022-07-23 17:41:34 -07:00
context-bar-controls.hpp
UI: Add application audio capture to toolbar
2022-07-23 17:41:34 -07:00
crash-report.cpp
UI: Force fixed font in plain text edits
2022-08-22 17:26:50 -07:00
crash-report.hpp
UI: Force fixed font in plain text edits
2022-08-22 17:26:50 -07:00
display-helpers.hpp
UI: Add option to draw safe areas in preview
2021-08-20 15:20:59 -07:00
double-slider.cpp
clang-format: Apply formatting
2019-06-23 23:49:10 -07:00
double-slider.hpp
clang-format: Apply formatting
2019-06-23 23:49:10 -07:00
expand-checkbox.hpp
UI, libobs, text-freetype2: Add missing pragma once in header files
2019-04-01 02:48:28 -05:00
focus-list.cpp
UI: Rename 'obs' dir to 'UI'
2016-08-27 20:19:45 -07:00
focus-list.hpp
clang-format: Apply formatting
2019-06-23 23:49:10 -07:00
horizontal-scroll-area.cpp
UI: Add Vertical Mixer option
2018-05-19 00:17:58 -03:00
horizontal-scroll-area.hpp
clang-format: Apply formatting
2019-06-23 23:49:10 -07:00
hotkey-edit.cpp
UI: Fix hotkey settings screen not accepting all input on macOS
2022-09-17 16:10:30 -07:00
hotkey-edit.hpp
UI: Fix hotkey settings screen not accepting all input on macOS
2022-09-17 16:10:30 -07:00
item-widget-helpers.cpp
UI: Don't reselect SceneTree items if tree is clearing
2022-09-30 05:41:35 -07:00
item-widget-helpers.hpp
UI: sort audio sources by name locale aware
2020-04-12 19:33:02 +02:00
lineedit-autoresize.cpp
UI: Don't hardcode margins in lineedit-autoresize
2022-08-06 10:22:25 +10:00
lineedit-autoresize.hpp
UI: Add vertically expanding LineEdit Widget
2022-06-27 14:35:01 -04:00
locked-checkbox.cpp
UI: Source Toolbar
2020-08-17 07:18:18 -07:00
locked-checkbox.hpp
UI: Source Toolbar
2020-08-17 07:18:18 -07:00
log-viewer.cpp
UI: Force fixed font in plain text edits
2022-08-22 17:26:50 -07:00
log-viewer.hpp
UI: Create Log Viewer window XML file, migrate code
2022-04-10 11:52:11 +10:00
media-controls.cpp
UI: Use std::unique_ptr for ui variables
2022-02-20 00:30:37 -08:00
media-controls.hpp
UI: Use std::unique_ptr for ui variables
2022-02-20 00:30:37 -08:00
media-slider.cpp
UI: Fix Qt 6 position deprecations
2022-07-22 09:37:17 -04:00
media-slider.hpp
UI: Add eventFilter to media slider
2022-06-11 16:28:57 -07:00
menu-button.cpp
UI: Fix Qt 6 position deprecations
2022-07-22 09:37:17 -04:00
menu-button.hpp
clang-format: Apply formatting
2019-06-23 23:49:10 -07:00
multiview.cpp
UI: Remove number from multiview labels
2022-11-12 18:36:35 -05:00
multiview.hpp
UI: Move multiview render into a new class
2022-07-10 13:45:43 +10:00
mute-checkbox.hpp
UI: Rename 'obs' dir to 'UI'
2016-08-27 20:19:45 -07:00
obf.c
clang-format: Apply formatting
2019-06-23 23:49:10 -07:00
obf.h
UI: Add obfuscation func
2019-02-07 14:47:15 -08:00
obs-app.cpp
UI: Fix snprintf calls with literals as buffer sizes
2022-11-11 19:51:28 +01:00
obs-app.hpp
UI: Add --steam flag
2022-10-22 16:23:50 -07:00
obs-proxy-style.cpp
UI: Remove compatibility for QT < 5.10
2022-07-31 21:47:01 -07:00
obs-proxy-style.hpp
UI: Disable wheel scrolling on QComboBoxes
2022-04-02 16:04:51 -07:00
obs.manifest
UI: Supply Windows manifest file
2020-01-01 15:58:48 +11:00
obs.rc.in
UI: Update CMakeLists.txt for main OBS app
2022-03-16 23:11:58 +01:00
plain-text-edit.cpp
UI: Force fixed font in plain text edits
2022-08-22 17:26:50 -07:00
plain-text-edit.hpp
UI: Force fixed font in plain text edits
2022-08-22 17:26:50 -07:00
platform-osx.mm
UI: Add function to open privacy preferences on macOS
2022-07-31 18:14:41 +02:00
platform-windows.cpp
UI: Remove support for toggling Aero
2022-11-08 20:44:47 -08:00
platform-x11.cpp
UI: Move taskbar overlay functions into platform.hpp
2022-05-20 20:16:56 +10:00
platform.hpp
UI: Remove support for toggling Aero
2022-11-08 20:44:47 -08:00
properties-view.cpp
UI: Fix properties tool button styling
2022-08-30 13:26:37 -04:00
properties-view.hpp
UI: Fix use-after-free in properties view
2022-08-17 05:30:57 -07:00
properties-view.moc.hpp
UI: Fix missing includes
2020-04-08 17:20:52 -07:00
qt-display.cpp
UI: Fix close display before native surfaces
2022-07-30 16:21:36 -07:00
qt-display.hpp
UI: Close display before native surfaces
2022-05-28 16:54:37 -07:00
qt-wrappers.cpp
UI: Fix snprintf calls with literals as buffer sizes
2022-11-11 19:51:28 +01:00
qt-wrappers.hpp
UI: Fix compiling error on nix platforms
2022-07-10 14:00:35 +10:00
record-button.cpp
UI: Remove unused assignments
2022-10-15 16:17:46 -07:00
record-button.hpp
UI: Add Virtual Camera source selector dialog
2022-07-31 15:39:18 -07:00
remote-text.cpp
UI: Add Whats New for macOS/Linux
2022-08-13 16:46:48 -07:00
remote-text.hpp
UI: Add postDataSize option to GetRemoteText
2021-09-15 07:44:55 +02:00
scene-tree.cpp
UI: Don't reselect SceneTree items if tree is clearing
2022-09-30 05:41:35 -07:00
scene-tree.hpp
UI: Add workaround for scenes being unselected
2022-08-29 23:15:39 +10:00
screenshot-obj.hpp
UI: JXR screenshots on Windows
2022-07-30 16:33:57 -07:00
slider-absoluteset-style.cpp
UI: Use Qt::MiddleButton instead of deprecated Qt::MidButton
2020-12-01 10:54:21 -05:00
slider-absoluteset-style.hpp
clang-format: Apply formatting
2019-06-23 23:49:10 -07:00
slider-ignorewheel.cpp
UI: Remove unneeded include
2022-01-04 01:54:38 -08:00
slider-ignorewheel.hpp
UI: Various screen reader fixes
2020-11-25 19:38:05 -08:00
source-label.cpp
clang-format: Apply formatting
2019-06-23 23:49:10 -07:00
source-label.hpp
UI: Fix warnings for Qt 5.15
2020-06-21 18:23:05 -07:00
source-tree.cpp
UI: Remove unused assignments
2022-10-15 16:17:46 -07:00
source-tree.hpp
UI: Fix source tree hovering being inconsistent
2022-08-30 18:49:23 +10:00
sparkle-updater.mm
Apply clang-format to objective c code
2019-07-09 13:39:13 -05:00
spinbox-ignorewheel.cpp
UI: Rename UI files for consistency
2019-04-21 04:10:46 -07:00
spinbox-ignorewheel.hpp
UI: Rename UI files for consistency
2019-04-21 04:10:46 -07:00
ui-config.h.in
UI: Set default theme to Yami
2022-07-28 20:38:51 -07:00
ui-validation.cpp
UI: Add Start Streaming settings check on start
2019-12-11 01:50:41 -08:00
ui-validation.hpp
UI: Add Start Streaming settings check on start
2019-12-11 01:50:41 -08:00
undo-stack-obs.cpp
UI: Optimize undo/redo functions with constant references
2022-01-19 21:39:43 +01:00
undo-stack-obs.hpp
UI: Optimize undo/redo functions with constant references
2022-01-19 21:39:43 +01:00
url-push-button.cpp
UI: Upgrade stream link hotlink to a button
2019-10-30 12:09:07 -07:00
url-push-button.hpp
UI: Upgrade stream link hotlink to a button
2019-10-30 12:09:07 -07:00
vertical-scroll-area.cpp
UI: Rename 'obs' dir to 'UI'
2016-08-27 20:19:45 -07:00
vertical-scroll-area.hpp
clang-format: Apply formatting
2019-06-23 23:49:10 -07:00
visibility-checkbox.cpp
UI: Source Toolbar
2020-08-17 07:18:18 -07:00
visibility-checkbox.hpp
UI: Source Toolbar
2020-08-17 07:18:18 -07:00
visibility-item-widget.cpp
UI: Adjust list style of filters dialog
2022-08-02 09:27:00 -03:00
visibility-item-widget.hpp
UI: Fix crash when pressing tab key in rename
2022-05-31 09:53:14 -04:00
volume-control.cpp
UI: Clamp float values possibly representing infinity to integer size
2022-10-09 16:20:03 -07:00
volume-control.hpp
UI: Clamp float values possibly representing infinity to integer size
2022-10-09 16:20:03 -07:00
window-basic-about.cpp
UI: Fix placeholder element not being deleted
2022-10-23 14:35:30 +02:00
window-basic-about.hpp
UI: Add Patreon contributors to About dialog
2019-05-05 20:00:26 -07:00
window-basic-adv-audio.cpp
UI: Cleanup advanced audio window
2022-06-18 23:13:13 +10:00
window-basic-adv-audio.hpp
UI: Cleanup advanced audio window
2022-06-18 23:13:13 +10:00
window-basic-auto-config-test.cpp
Revert service json lookup refactor in UI
2022-07-18 14:52:26 -07:00
window-basic-auto-config.cpp
UI: Don't offer current resolution in auto config if < 240p
2022-10-13 23:13:27 +02:00
window-basic-auto-config.hpp
Revert service json lookup refactor in UI
2022-07-18 14:52:26 -07:00
window-basic-filters.cpp
UI: Fix crash when removing filter after changing a value
2022-09-21 14:32:09 -04:00
window-basic-filters.hpp
UI: Add OBSQTDisplay::OnMove()/OnDisplayChange()
2022-02-26 01:09:07 -08:00
window-basic-interaction.cpp
UI: Fix Qt 6 position deprecations
2022-07-22 09:37:17 -04:00
window-basic-interaction.hpp
UI: Add OBSQTDisplay::OnMove()/OnDisplayChange()
2022-02-26 01:09:07 -08:00
window-basic-main-browser.cpp
clang-format: Apply formatting
2019-06-23 23:49:10 -07:00
window-basic-main-dropfiles.cpp
UI: Support JXR image dropEvent on Windows
2022-05-08 15:25:43 -07:00
window-basic-main-icons.cpp
libobs, UI: Add OBS_ICON_TYPE_PROCESS_AUDIO_OUTPUT
2022-07-23 17:41:34 -07:00
window-basic-main-outputs.cpp
UI: Replace invocations of sprintf with snprintf
2022-11-11 19:51:27 +01:00
window-basic-main-outputs.hpp
Merge pull request #5371 from norihiro/automatic-file-splitting
2022-04-10 16:49:37 -07:00
window-basic-main-profiles.cpp
UI: Fix snprintf calls with literals as buffer sizes
2022-11-11 19:51:28 +01:00
window-basic-main-scene-collections.cpp
UI,mac-avcapture: Use consistent variables in locales
2022-07-02 14:02:40 +10:00
window-basic-main-screenshot.cpp
obs-frontend-api: Add functions to get last saved files
2022-10-30 19:53:11 -07:00
window-basic-main-transitions.cpp
UI: Replace manual usage of on_foo_bar for show/hide transition
2022-11-08 20:49:56 -08:00
window-basic-main.cpp
UI: Fix QStyle memory leak
2022-11-09 23:07:53 -08:00
window-basic-main.hpp
UI: Use on_foo_bar properly for docks context menu
2022-11-08 20:49:56 -08:00
window-basic-preview.cpp
UI: Remove unused assignments
2022-10-15 16:17:46 -07:00
window-basic-preview.hpp
UI: Show spacing helpers in preview
2022-07-30 19:41:18 -07:00
window-basic-properties.cpp
UI: Fix compiler warning when WIN32 is not defined
2022-04-23 16:12:45 -07:00
window-basic-properties.hpp
UI: Create Properties window XML file, migrate code
2022-04-10 11:52:11 +10:00
window-basic-settings-a11y.cpp
UI: Add Accessibility menu to settings
2022-07-27 21:37:30 -04:00
window-basic-settings-stream.cpp
obs-ffmpeg: Direct setting of encryption & auth for SRT & RIST
2022-11-17 21:56:38 -05:00
window-basic-settings.cpp
UI: Remove support for toggling Aero
2022-11-08 20:44:47 -08:00
window-basic-settings.hpp
UI: Remove support for toggling Aero
2022-11-08 20:44:47 -08:00
window-basic-source-select.cpp
UI: Add support for nonlinear SRGB blending
2022-04-02 16:02:41 -07:00
window-basic-source-select.hpp
UI: Apply transforms/crops correctly to sources on paste
2021-11-10 14:22:45 -08:00
window-basic-stats.cpp
UI: Fix stats widget appearance on Yami themes
2022-10-19 15:02:25 -04:00
window-basic-stats.hpp
UI: Fix stats widget appearance on Yami themes
2022-10-19 15:02:25 -04:00
window-basic-status-bar.cpp
UI: Remove unnecessary UNUSED_PARAMETER
2022-07-19 11:01:00 -04:00
window-basic-status-bar.hpp
UI: Add status icons for recording and streaming
2020-04-16 19:15:13 +02:00
window-basic-transform.cpp
UI: Fix a stack overlow caused by using OBSScene
2021-12-16 23:38:59 -08:00
window-basic-transform.hpp
UI: Update Edit Transform dialog on scene switch
2021-11-10 06:08:48 -08:00
window-basic-vcam-config.cpp
UI: Use transform to fit vcam source to canvas
2022-10-11 15:38:30 -07:00
window-basic-vcam-config.hpp
UI: Save virtual camera outside of the modules object
2022-08-18 02:35:13 -07:00
window-dock-browser.cpp
UI: Check for null pointer
2019-09-19 05:39:25 -07:00
window-dock-browser.hpp
UI: Make BrowserDock native
2021-01-26 09:43:16 -08:00
window-dock.cpp
clang-format: Apply formatting
2019-06-23 23:49:10 -07:00
window-dock.hpp
UI: Warn when closing dock widgets for first time
2019-03-05 14:39:24 -08:00
window-extra-browsers.cpp
UI: Remove separate trash icon themeID
2022-08-20 16:46:02 -07:00
window-extra-browsers.hpp
UI: Remove UUID from ExtraBrowsersModel
2022-03-22 22:24:23 -07:00
window-importer.cpp
UI: Fix imported scene collection names duplicating
2021-04-20 00:17:34 -07:00
window-importer.hpp
UI: Add advanced scene collection importer
2020-02-16 17:56:06 +13:00
window-log-reply.cpp
UI: Add button to Analyzer in the Log Reply window
2020-04-07 20:43:12 +10:00
window-log-reply.hpp
UI: Add button to Analyzer in the Log Reply window
2020-04-07 20:43:12 +10:00
window-main.hpp
clang-format: Apply formatting
2019-06-23 23:49:10 -07:00
window-missing-files.cpp
UI,mac-avcapture: Use consistent variables in locales
2022-07-02 14:02:40 +10:00
window-missing-files.hpp
UI: Add missing files dialog
2021-01-17 10:31:59 +13:00
window-namedialog.cpp
Revert "UI: Disable hotkeys when a user is expected to type text"
2021-10-03 07:52:44 -07:00
window-namedialog.hpp
UI: Run Autoconfig Wizard on New Profile Creation
2020-10-29 14:15:57 -07:00
window-permissions.cpp
UI: Add macOS permissions window
2022-07-31 18:14:41 +02:00
window-permissions.hpp
UI: Add macOS permissions window
2022-07-31 18:14:41 +02:00
window-projector.cpp
UI: Use weak source for projectors
2022-11-17 18:41:23 -05:00
window-projector.hpp
UI: Use weak source for projectors
2022-11-17 18:41:23 -05:00
window-remux.cpp
UI: Truncate displayed file paths in the middle in Remux window
2022-04-07 01:52:02 -07:00
window-remux.hpp
UI: Declare missing overrides
2019-07-21 20:53:30 -07:00
window-youtube-actions.cpp
UI: Add ability to send messages to YouTube chat
2022-06-27 14:35:01 -04:00
window-youtube-actions.hpp
UI: Mark YouTube window showEvent as override
2022-06-01 19:43:03 -04:00
youtube-api-wrappers.cpp
UI: Add SendChatMessage to YouTube API wrappers
2022-06-27 14:35:01 -04:00
youtube-api-wrappers.hpp
UI: Add SendChatMessage to YouTube API wrappers
2022-06-27 14:35:01 -04:00